public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-24 10:44:50 +01:00
parent 28cdb6e841 e41154d1ab
commit c1792242ef
92 changed files with 1146 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openssl/chacha.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, perl, zlib
, withCryptodev ? false, cryptodevHeaders
, withCryptodev ? false, cryptodev
}:
with stdenv.lib;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
setOutputFlags = false;
nativeBuildInputs = [ perl zlib ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
buildInputs = stdenv.lib.optional withCryptodev cryptodev;
configureScript = "./config";
pkgs/development/libraries/openssl/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders
, withCryptodev ? false, cryptodev
, enableSSL2 ? false
, static ? false
}:
@@ -38,7 +38,7 @@ let
separateDebugInfo = stdenv.hostPlatform.isLinux;
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
buildInputs = stdenv.lib.optional withCryptodev cryptodev;
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];