summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-04-11 02:10:50 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2016-04-14 08:32:20 +0300
commitf34655e28cedb36acbf608bbeff96e5a91290b26 (patch)
tree59d68734ac75d09ea3be7b67c61f0b776d95cfb3 /pkgs
parent3f9cfba02c64a2d98b34c595f551a7eb5c847647 (diff)
downloadnixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.tar
nixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.tar.gz
nixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.tar.bz2
nixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.tar.lz
nixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.tar.xz
nixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.tar.zst
nixlib-f34655e28cedb36acbf608bbeff96e5a91290b26.zip
openssl-chacha: Split into multiple outputs
Mainly done because of this in all-packages.nix:
````
  cipherscan = callPackage ../tools/security/cipherscan {
    openssl = if stdenv.system == "x86_64-linux"
      then openssl-chacha
      else openssl;
  };
````
... and inside cipherscan we want to refer to `openssl.bin`
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/openssl/chacha.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index b610f27d17cf..8187fcedabf1 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "1030rs4bdaysxbq0mmck1dn6g5adspzkwsrnhvv16b4ig0r4ncgj";
   };
 
+  outputs = [ "dev" "out" "man" "bin" ];
+  setOutputFlags = false;
+
   nativeBuildInputs = [ perl zlib ];
   buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
@@ -35,7 +38,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "MANDIR=$(out)/share/man"
+    "MANDIR=$(man)/share/man"
   ];
 
   # Parallel building is broken in OpenSSL.
@@ -48,8 +51,16 @@ stdenv.mkDerivation rec {
         rm "$out/lib/"*.a
     fi
 
+    mkdir -p $bin
+    mv $out/bin $bin/
+
+    mkdir $dev
+    mv $out/include $dev/
+
     # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+    rm -r $out/etc/ssl/misc
+
+    rmdir $out/etc/ssl/{certs,private}
   '';
 
   postFixup = ''