From f1b7cb7cebcf66fe569f32aab3b724821edb3d7c Mon Sep 17 00:00:00 2001 From: Alexander Kjeldaas Date: Wed, 16 Apr 2014 23:41:50 +0200 Subject: [PATCH] Added lib output to xfsprogs. This only contains static archives since xfsprogs is compiled with dynamic libraries disabled. --- pkgs/tools/filesystems/xfsprogs/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 400890e95f3..7c9cd05009d 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -12,11 +12,26 @@ stdenv.mkDerivation rec { sed -i s,/bin/bash,`type -P bash`, install-sh ''; + outputs = ["out" "lib"]; + + postInstall = '' + (cd include; make install-dev) + # The make install-dev target is broken when --disable-shared + mkdir -p $lib/lib $lib/include + cp ./libhandle/.libs/libhandle.a \ + ./libxcmd/.libs/libxcmd.a \ + ./libxlog/.libs/libxlog.a \ + ./libxfs/.libs/libxfs.a $lib/lib + mv $out/include/* $lib/include + ''; + + enableParallelBuilding = true; + buildInputs = [ libtool gettext libuuid ]; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared"; preConfigure = '' - configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$out/lib" + configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib" ''; disableStatic = false;