mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-23 04:25:14 +00:00
Apparmor: minor cleanup
This commit is contained in:
parent
3e56da4e77
commit
1ee86005b9
@ -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 ..
|
||||
|
Loading…
Reference in New Issue
Block a user