diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:23:34 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:23:34 +0000 |
commit | 7ca90544209689e55a6d30ca8cb38f9a7ed99898 (patch) | |
tree | 492ce0d4345158aee0f647c1e529bab8f4936beb /pkgs | |
parent | 592cb44e525d8d724995be9c97511a0ab84852be (diff) | |
download | nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.tar nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.tar.gz nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.tar.bz2 nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.tar.lz nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.tar.xz nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.tar.zst nixpkgs-7ca90544209689e55a6d30ca8cb38f9a7ed99898.zip |
* Use substituteInPlace.
svn path=/nixpkgs/trunk/; revision=7489
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index b7b1c07072f..aac8c06172d 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation { }; preBuild = " - sed 's|/usr/include|${stdenv.glibc}/include|' < libcap/Makefile > libcap/Makefile.tmp - mv libcap/Makefile.tmp libcap/Makefile - + substituteInPlace libcap/Makefile --replace /usr/include ${stdenv.glibc}/include installFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\" "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index addaf1ac41b..43ade0db676 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2212,7 +2212,8 @@ rec { }; libcap = import ../os-specific/linux/libcap { - inherit fetchurl stdenv; + inherit fetchurl; + stdenv = overrideSetup stdenv ../stdenv/generic/setup-new2.sh; }; lvm2 = import ../os-specific/linux/lvm2 { |