alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: Mass replace 'attr}/lib' to refer the 'out' output

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:28:56 +02:00
parent e865a647f4
commit f412f5f3ee
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/security/apparmor-suid.nix
View file

@ -30,7 +30,7 @@ with lib;
${pkgs.glibc.out}/lib/*.so mr, ${pkgs.glibc.out}/lib/*.so mr,
${pkgs.libcap}/lib/libcap.so* mr, ${pkgs.libcap}/lib/libcap.so* mr,
${pkgs.attr}/lib/libattr.so* mr, ${pkgs.attr.out}/lib/libattr.so* mr,
${pkgs.iputils}/bin/ping mixr, ${pkgs.iputils}/bin/ping mixr,
/var/setuid-wrappers/ping.real r, /var/setuid-wrappers/ping.real r,

2
pkgs/tools/filesystems/xtreemfs/default.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
--replace "/usr/local" "${valgrind}" --replace "/usr/local" "${valgrind}"
substituteInPlace cpp/CMakeLists.txt \ substituteInPlace cpp/CMakeLists.txt \
--replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"' --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${fuse}/lib"'
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include"
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib" export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib"