about summary refs log tree commit diff
path: root/pkgs/development/libraries/openssl/default.nix
diff options
context:
space:
mode:
authorDavid McFarland <corngood@gmail.com>2017-03-04 16:40:50 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2017-04-03 09:04:44 +0200
commit2c006ca80565a2a58fbf992f6442722baed497cc (patch)
tree5c3399bc1009ec9d7c5799c3b34798af20dc02c7 /pkgs/development/libraries/openssl/default.nix
parent398823da6e8a98d92086606988a78fda7bbeca5b (diff)
downloadnixlib-2c006ca80565a2a58fbf992f6442722baed497cc.tar
nixlib-2c006ca80565a2a58fbf992f6442722baed497cc.tar.gz
nixlib-2c006ca80565a2a58fbf992f6442722baed497cc.tar.bz2
nixlib-2c006ca80565a2a58fbf992f6442722baed497cc.tar.lz
nixlib-2c006ca80565a2a58fbf992f6442722baed497cc.tar.xz
nixlib-2c006ca80565a2a58fbf992f6442722baed497cc.tar.zst
nixlib-2c006ca80565a2a58fbf992f6442722baed497cc.zip
Revert "openssl: add custom build of 1.0.2 for steam"
No longer necessary. See https://github.com/NixOS/nixpkgs/pull/23034#issuecomment-291005754

This reverts commit a50784b34e771aa4a6c5f4eeb8c25295c15e4ed4.
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
-rw-r--r--pkgs/development/libraries/openssl/default.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index a9f8c32dde9b..2009daa1cc86 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -9,7 +9,7 @@ let
   opensslCrossSystem = stdenv.cross.openssl.system or
     (throw "openssl needs its platform name cross building");
 
-  common = args@{ version, sha256, patches ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec {
+  common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
     name = "openssl-${version}";
 
     src = fetchurl {
@@ -47,10 +47,7 @@ let
     ] ++ stdenv.lib.optionals withCryptodev [
       "-DHAVE_CRYPTODEV"
       "-DUSE_CRYPTODEV_DIGESTS"
-    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
-    ++ args.configureFlags or [];
-
-    postConfigure = if makeDepend then "make depend" else null;
+    ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2";
 
     makeFlags = [ "MANDIR=$(man)/share/man" ];
 
@@ -121,12 +118,4 @@ in {
     sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
   };
 
-  openssl_1_0_2-steam = common {
-    version = "1.0.2k";
-    sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb";
-    configureFlags = [ "no-engine" ];
-    makeDepend = true;
-    patches = [ ./openssl-fix-cpuid_setup.patch ];
-  };
-
 }