Author: simons
Date: Thu Jul 7 21:04:56 2011
New Revision: 27646
URL: https://svn.nixos.org/websvn/nix/?rev=27646&sc=1
Log:
pkgs/applications/editors/emacs-modes/bbdb: replace custom build script with
standard builder
Also added most of optional contributions shipped in the release tarball to the
installation.
Deleted:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/bbdb/builder.sh
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/bbdb/default.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-modes/bbdb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-modes/bbdb/default.nix
Thu Jul 7 20:48:51 2011 (r27645)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-modes/bbdb/default.nix
Thu Jul 7 21:04:56 2011 (r27646)
@@ -11,7 +11,20 @@
patches = [ ./install-infodir.patch ];
buildInputs = [emacs texinfo ctags];
- builder = ./builder.sh;
+ configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
+ preInstall = "ensureDir $out/info";
+ installTargets = "install-pkg texinfo";
+ postInstall = ''
+ mv $out/info $out/share/
+ mv "$out/share/emacs/site-lisp/lisp/bbdb/"* $out/share/emacs/site-lisp/
+ mv $out/share/emacs/site-lisp/etc/bbdb $out/share/
+ rm -rf $out/share/emacs/site-lisp/{lisp,etc}
+ mv bits $out/share/bbdb/
+ # Make optional modules from bbdb available for import, but symlink
+ # them into the site-lisp directory to make it obvious that they are
+ # not a genuine part of the distribution.
+ ln -s "$out/share/bbdb/bits/"*.el $out/share/emacs/site-lisp/
+ '';
meta = {
description = "The Insidious Big Brother Database (BBDB), a contact
management utility for Emacs";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
