diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-05-26 14:01:11 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-05-26 14:01:11 +0000 |
| commit | 94672236c6939e890ed678f5e29d19cbc9643f59 (patch) | |
| tree | 8392dbe667b50e9a21b90ebc5ed3ce4995f3c8c9 /pkgs/tools | |
| parent | 610bf2a24f1d0f63790e5a4959af7d36680606b0 (diff) | |
| download | nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.tar nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.tar.gz nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.tar.bz2 nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.tar.lz nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.tar.xz nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.tar.zst nixlib-94672236c6939e890ed678f5e29d19cbc9643f59.zip | |
svn path=/nixpkgs/trunk/; revision=11899
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/custom.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix index fdbfb2d7bec0..b2d709d7e102 100644 --- a/pkgs/tools/package-management/nix/custom.nix +++ b/pkgs/tools/package-management/nix/custom.nix @@ -33,16 +33,20 @@ stdenv.mkDerivation { ; preConfigure = - (lib.concatMapStrings (script: ''sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am - '') enableScripts) - + preConfigure - + "\n./bootstrap.sh" - ; + (lib.concatMapStrings (script: + '' + sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am + '' + ) enableScripts) + + preConfigure + + "\n./bootstrap.sh"; - configureFlags = [" + configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} - --disable-init-state"] ++ configureFlags ; + --disable-init-state + ${configureFlags} + ''; meta = { description = "The Nix Deployment System"; |