diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-30 14:47:23 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-30 14:47:23 +0000 |
commit | 4bf5b0d36b04290818cd909acdd351fc474c0e93 (patch) | |
tree | d4e84dd2ace4d3edf5657712580e6924b4ad80f5 /pkgs/applications/version-management/mercurial | |
parent | 7835419d8adabca517aebf84b2e46712ea9906f9 (diff) | |
download | nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.tar nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.tar.gz nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.tar.bz2 nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.tar.lz nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.tar.xz nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.tar.zst nixlib-4bf5b0d36b04290818cd909acdd351fc474c0e93.zip |
* Fix some more "args: with args".
svn path=/nixpkgs/trunk/; revision=22828
Diffstat (limited to 'pkgs/applications/version-management/mercurial')
-rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 054dd0c1813a..bc5af2f37c7b 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,7 +1,9 @@ -args: with args; +{ stdenv, fetchurl, python, makeWrapper +, guiSupport ? false, tk ? null }: stdenv.mkDerivation rec { name = "mercurial-1.5.1"; + src = fetchurl { url = "http://www.selenic.com/mercurial/release/${name}.tar.gz"; sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569"; @@ -10,8 +12,10 @@ stdenv.mkDerivation rec { inherit python; # pass it so that the same version can be used in hg2git buildInputs = [ python makeWrapper ]; + makeFlags = "PREFIX=$(out)"; - postInstall = (if args.guiSupport then + + postInstall = (stdenv.lib.optionalString guiSupport '' ensureDir $out/etc/mercurial cp contrib/hgk $out/bin @@ -23,9 +27,7 @@ stdenv.mkDerivation rec { WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\" --set HG \"$out/bin/hg\" --prefix PATH : \"${tk}/bin\" " - '' - else "") - + + '') + '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ |