dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Use substituteInPlace.

Browse Source 
svn path=/nixpkgs/trunk/; revision=7489
This commit is contained in:
Eelco Dolstra 2006-12-27 17:23:34 +00:00
parent 592cb44e52
commit 7ca9054420
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/libcap/default.nix
View File

@ -8,9 +8,7 @@ stdenv.mkDerivation {
}; };
preBuild = " preBuild = "
sed 's|/usr/include|${stdenv.glibc}/include|' < libcap/Makefile > libcap/Makefile.tmp substituteInPlace libcap/Makefile --replace /usr/include ${stdenv.glibc}/include
mv libcap/Makefile.tmp libcap/Makefile
installFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\" installFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\"
"; ";

3
pkgs/top-level/all-packages.nix
View File

@ -2212,7 +2212,8 @@ rec {
}; };
libcap = import ../os-specific/linux/libcap { 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 { lvm2 = import ../os-specific/linux/lvm2 {