From 11ce1cab97ccbe38ed6f276f3fbd2dd7851d05e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 17:11:36 +0200 Subject: [PATCH] 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 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index ab8545b438e..4b793c29c55 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig intltool gperf kmod xz pam acl + [ pkgconfig intltool gperf libcap kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libmicrohttpd linuxHeaders kexectools ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; - propagatedBuildInputs = [ libcap ]; - configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" @@ -150,6 +148,8 @@ stdenv.mkDerivation rec { done rm -rf $out/etc/rpm + + rm $out/lib/*.la ''; # */ enableParallelBuilding = true;