diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-18 11:28:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-18 11:28:41 +0000 |
| commit | a5e0e39cdb575a38216a2a0e9ee25eae5bb05397 (patch) | |
| tree | e6b18a2d7ec3c888344793680aeb48ddd33e7e9a /pkgs/applications/graphics/xfig | |
| parent | b59d32be03c5cc10d8ebed0305524907fd062481 (diff) | |
* makeWrapper: option --run <CMD> to run a command from the wrapper.
This is so that the Unison wrapper can be generated with makeWrapper. * Use makeWrapper as a buildInput everywhere. * Updated BitTorrent, cvs2svn. svn path=/nixpkgs/trunk/; revision=10213
Diffstat (limited to 'pkgs/applications/graphics/xfig')
| -rw-r--r-- | pkgs/applications/graphics/xfig/builder.sh | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/xfig/default.nix | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh index de64fbce78fa2..dc943180508e2 100644 --- a/pkgs/applications/graphics/xfig/builder.sh +++ b/pkgs/applications/graphics/xfig/builder.sh @@ -1,5 +1,4 @@ source $stdenv/setup -source $makeWrapper makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man" @@ -16,9 +15,7 @@ installCommand=myInstall myInstall() { make install.all $makeFlags - mv $out/bin/xfig $out/bin/.xfig - - makeWrapper $out/bin/.xfig $out/bin/xfig \ + wrapProgram $out/bin/xfig \ --set XAPPLRESDIR $out/etc/X11/app-defaults } diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 0d94d4a655d0e..49de840e2dcbf 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; - - inherit makeWrapper; + buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg makeWrapper]; NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11"; |