diff options
| author | Alexander Kjeldaas <ak@formalprivacy.com> | 2014-04-16 23:41:50 +0200 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2014-06-28 20:43:51 -0500 |
| commit | f1b7cb7cebcf66fe569f32aab3b724821edb3d7c (patch) | |
| tree | e60247cedab65dd6cca4c05791dbf54c35838e69 /pkgs/tools/filesystems/xfsprogs | |
| parent | 2245580812a48e6ded1623e3f30b98aec793d698 (diff) | |
| download | nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.tar nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.tar.gz nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.tar.bz2 nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.tar.lz nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.tar.xz nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.tar.zst nixlib-f1b7cb7cebcf66fe569f32aab3b724821edb3d7c.zip | |
Added lib output to xfsprogs.
This only contains static archives since xfsprogs is compiled with dynamic libraries disabled.
Diffstat (limited to 'pkgs/tools/filesystems/xfsprogs')
| -rw-r--r-- | pkgs/tools/filesystems/xfsprogs/default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 400890e95f30..7c9cd05009d6 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; |