mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
* Use substituteInPlace.
svn path=/nixpkgs/trunk/; revision=7489
This commit is contained in:
parent
592cb44e52
commit
7ca9054420
2 changed files with 3 additions and 4 deletions
|
@ -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\"
|
||||
";
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue