public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apparmor: minor cleanup

Browse Source
This commit is contained in:
Evgeny Egorochkin 2013-05-11 21:13:53 +03:00
parent 3e56da4e77
commit 1ee86005b9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl { stdenv, fetchurl
, autoconf, automake, libtool, makeWrapper , autoconf, automake, libtool, makeWrapper
, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext , 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 { stdenv.mkDerivation rec {
name = "apparmor-${version}"; name = "apparmor-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
autoconf automake libtool perl bison flex gettext which rpm tetex 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 = '' prePatch = ''
substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include" substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include"
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
ensureDir $out/lib/perl5/site_perl/ ensureDir $out/lib/perl5/site_perl/
cp swig/perl/LibAppArmor.pm $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/ cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/
# this is automatically copied elsewhere.... # this is automatically copied elsewhere....
cd ../../utils cd ../../utils
make make
@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
make install DESTDIR=$out make install DESTDIR=$out
cd ../../profiles cd ../../profiles
LD_LIBRARY_PATH=$out/lib make 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 check # depends on the parser having been built first
make install DESTDIR=$out make install DESTDIR=$out
cd .. cd ..