From f34655e28cedb36acbf608bbeff96e5a91290b26 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 11 Apr 2016 02:10:50 +0300 Subject: [PATCH] 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` --- pkgs/development/libraries/openssl/chacha.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index b610f27d17c..8187fcedabf 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 = ''