diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 16:37:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 16:37:26 +0200 |
| commit | 9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8 (patch) | |
| tree | f73e72f03f9f0a4508410a8ba1d5cee1a97f4018 /pkgs/os-specific/linux/apparmor | |
| parent | 753cfbe09b06a40c35bc49f84d7ad9b128b0deff (diff) | |
| download | nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.tar nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.tar.gz nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.tar.bz2 nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.tar.lz nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.tar.xz nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.tar.zst nixpkgs-9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8.zip | |
apparmor: fixup to use some multiple-output paths
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 64c6f66575b..49fdbab24ca 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -22,7 +22,7 @@ let prePatchCommon = '' substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" - substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h" substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; @@ -49,8 +49,8 @@ let dontDisableStatic = true; prePatch = prePatchCommon + '' - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h" ''; postPatch = "cd ./libraries/libapparmor"; @@ -104,7 +104,7 @@ let prePatch = prePatchCommon + '' substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" - substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h" ## techdoc.pdf still doesn't build ... substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" ''; |