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

Merge pull request #50558 from oxij/pkgs/openssl-fix-cryptodev

Browse Source 
openssl: fix `cryptodev` fallout
This commit is contained in:
Jörg Thalheim 2018-11-22 11:04:53 +00:00 committed by GitHub
commit 6093167164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openssl/chacha.nix
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";

4
pkgs/development/libraries/openssl/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders
, withCryptodev ? false, cryptodev
, enableSSL2 ? false
, static ? false
}:
@ -44,7 +44,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 = [];

13
pkgs/top-level/all-packages.nix
View File

@ -11692,20 +11692,11 @@ with pkgs;
inherit (callPackages ../development/libraries/openssl {
fetchurl = fetchurlBoot;
cryptodevHeaders = linuxPackages.cryptodev.override {
fetchurl = fetchurlBoot;
onlyHeaders = true;
};
})
openssl_1_0_2
openssl_1_1;
openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
cryptodevHeaders = linuxPackages.cryptodev.override {
fetchurl = fetchurlBoot;
onlyHeaders = true;
};
};
openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { };
opensubdiv = callPackage ../development/libraries/opensubdiv {
cudaSupport = config.cudaSupport or false;
@ -14633,6 +14624,8 @@ with pkgs;
buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;
cryptodev = linuxPackages_4_9.cryptodev;
dpdk = callPackage ../os-specific/linux/dpdk {
kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
};