diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
| commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
| tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/tools/package-management | |
| parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
| parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/custom.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix index 6a73c0e9528ef..5b1569291e1fd 100644 --- a/pkgs/tools/package-management/nix/custom.nix +++ b/pkgs/tools/package-management/nix/custom.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { preConfigure = (lib.concatMapStrings (script: '' - sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am + sed -e '/bin_SCRIPTS = /a${script} \\' -i scripts/Makefile.am '' ) enableScripts) + preConfigure |