diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-11 21:13:53 +0300 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-11 21:14:35 +0300 |
| commit | 1ee86005b96c8e627975cbb7fd6e5db1bbc626d0 (patch) | |
| tree | c5d245c4c865b7951ad9e425e335aac95591368d /pkgs/os-specific/linux/apparmor | |
| parent | 3e56da4e77fd080111caf71e3988883d961c5e3e (diff) | |
| download | nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.tar nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.tar.gz nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.tar.bz2 nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.tar.lz nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.tar.xz nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.tar.zst nixpkgs-1ee86005b96c8e627975cbb7fd6e5db1bbc626d0.zip | |
Apparmor: minor cleanup
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 97ed15ac493..da71eb8c709 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , autoconf, automake, libtool, makeWrapper , perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext -, bash, pam, TermReadKey, RpcXML, swig, python, linuxHeaders }: +, bash, pam, TermReadKey, RpcXML, swig, python}: stdenv.mkDerivation rec { name = "apparmor-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool perl bison flex gettext which rpm tetex - LocaleGettext pam TermReadKey RpcXML swig makeWrapper python linuxHeaders ]; + LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ]; prePatch = '' substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include" @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ensureDir $out/lib/perl5/site_perl/ cp swig/perl/LibAppArmor.pm $out/lib/perl5/site_perl/ cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/ -# this is automatically copied elsewhere.... + # this is automatically copied elsewhere.... cd ../../utils make @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { make install DESTDIR=$out cd ../../profiles -LD_LIBRARY_PATH=$out/lib make -#LD_LIBRARY_PATH=$out/lib make check # depends on the parser having been built first + LD_LIBRARY_PATH=$out/lib make + #LD_LIBRARY_PATH=$out/lib make check # depends on the parser having been built first make install DESTDIR=$out cd .. |