about summary refs log tree commit diff
path: root/pkgs/development/libraries/libarchive
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-19 14:33:25 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-19 20:03:11 +0200
commit37f2679e735b8a85954c2dce5eae593338360ac7 (patch)
tree498d7e4c663e375c3a7cfa03bb0a8c9cdae8ae99 /pkgs/development/libraries/libarchive
parent8b31b91a220c33ca97d73b443fbcc0d8ae90074e (diff)
downloadnixlib-37f2679e735b8a85954c2dce5eae593338360ac7.tar
nixlib-37f2679e735b8a85954c2dce5eae593338360ac7.tar.gz
nixlib-37f2679e735b8a85954c2dce5eae593338360ac7.tar.bz2
nixlib-37f2679e735b8a85954c2dce5eae593338360ac7.tar.lz
nixlib-37f2679e735b8a85954c2dce5eae593338360ac7.tar.xz
nixlib-37f2679e735b8a85954c2dce5eae593338360ac7.tar.zst
nixlib-37f2679e735b8a85954c2dce5eae593338360ac7.zip
libarchive: Use multiple outputs
Diffstat (limited to 'pkgs/development/libraries/libarchive')
-rw-r--r--pkgs/development/libraries/libarchive/default.nix6
1 files 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;