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

openssl: fix cryptodev fallout from d836b811cb533c4cacba9a932d4906cbb41abc7c

Browse Source
This commit is contained in:
Jan Malakhovski 2018-11-18 08:01:02 +00:00
parent 617132eba7
commit 7c48015019
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 { stdenv, fetchFromGitHub, perl, zlib
, withCryptodev ? false, cryptodevHeaders , withCryptodev ? false, cryptodev
}: }:
with stdenv.lib; with stdenv.lib;
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
setOutputFlags = false; setOutputFlags = false;
nativeBuildInputs = [ perl zlib ]; nativeBuildInputs = [ perl zlib ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; buildInputs = stdenv.lib.optional withCryptodev cryptodev;
configureScript = "./config"; configureScript = "./config";

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPackages, perl, coreutils { stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders , withCryptodev ? false, cryptodev
, enableSSL2 ? false , enableSSL2 ? false
, static ? false , static ? false
}: }:
@ -44,7 +44,7 @@ let
separateDebugInfo = stdenv.hostPlatform.isLinux; separateDebugInfo = stdenv.hostPlatform.isLinux;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; buildInputs = stdenv.lib.optional withCryptodev cryptodev;
# TODO(@Ericson2314): Improve with mass rebuild # TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = []; configurePlatforms = [];

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

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