systemd: Don't propagate libcap

Instead delete the *.la files. The propagation of libcap was
apparently only necessary because there was a gratuitous -lcap in the
*.la files.

http://hydra.nixos.org/build/22182620
This commit is contained in:
Eelco Dolstra 2015-05-13 17:11:36 +02:00
parent ab91aaaeb8
commit 11ce1cab97
1 changed files with 3 additions and 3 deletions

View File

@ -25,13 +25,11 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = buildInputs =
[ pkgconfig intltool gperf kmod xz pam acl [ pkgconfig intltool gperf libcap kmod xz pam acl
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
libmicrohttpd linuxHeaders kexectools libmicrohttpd linuxHeaders kexectools
] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
propagatedBuildInputs = [ libcap ];
configureFlags = configureFlags =
[ "--localstatedir=/var" [ "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
@ -150,6 +148,8 @@ stdenv.mkDerivation rec {
done done
rm -rf $out/etc/rpm rm -rf $out/etc/rpm
rm $out/lib/*.la
''; # */ ''; # */
enableParallelBuilding = true; enableParallelBuilding = true;