From 37f2679e735b8a85954c2dce5eae593338360ac7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Sep 2016 14:33:25 +0200 Subject: [PATCH] libarchive: Use multiple outputs --- pkgs/development/libraries/libarchive/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 34ad2532d41d..b2b007765820 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"; }; + outputs = [ "out" "lib" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { '' else null; preFixup = '' - sed -i $out/lib/libarchive.la \ + sed -i $lib/lib/libarchive.la \ -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \ -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { longDescription = '' This library has code for detecting and reading many archive formats and compressions formats including (but not limited to) tar, shar, cpio, zip, and - compressed with gzip, bzip2, lzma, xz, .. + compressed with gzip, bzip2, lzma, xz, ... ''; homepage = http://libarchive.org; license = stdenv.lib.licenses.bsd3;