summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-07-13 11:40:47 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-07-13 11:40:47 +0000
commit35505a442ef53519a008e8e741d69fab9f4ae360 (patch)
tree8cecd8d1027835241afd366bf7ff5e284b451c6e /pkgs
parentce11df9d807f2a1ae60b3829df4e6415597dc675 (diff)
downloadnixlib-35505a442ef53519a008e8e741d69fab9f4ae360.tar
nixlib-35505a442ef53519a008e8e741d69fab9f4ae360.tar.gz
nixlib-35505a442ef53519a008e8e741d69fab9f4ae360.tar.bz2
nixlib-35505a442ef53519a008e8e741d69fab9f4ae360.tar.lz
nixlib-35505a442ef53519a008e8e741d69fab9f4ae360.tar.xz
nixlib-35505a442ef53519a008e8e741d69fab9f4ae360.tar.zst
nixlib-35505a442ef53519a008e8e741d69fab9f4ae360.zip
* Remove some dead files.
svn path=/nixpkgs/trunk/; revision=27752
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/openssl/1.x.nix45
-rw-r--r--pkgs/development/libraries/openssl/darwin-arch-1.patch16
2 files changed, 0 insertions, 61 deletions
diff --git a/pkgs/development/libraries/openssl/1.x.nix b/pkgs/development/libraries/openssl/1.x.nix
deleted file mode 100644
index eae32de30e48..000000000000
--- a/pkgs/development/libraries/openssl/1.x.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, perl }:
-
-let
-  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
-    (throw "openssl needs its platform name cross building" null)
-    stdenv.cross;
-in
-
-stdenv.mkDerivation (rec {
-  name = "openssl-1.0.0";
-
-  src = fetchurl {
-    url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62";
-  };
-
-  buildNativeInputs = [ perl ];
-
-  configureScript = "./config";
-
-  configureFlags="--libdir=lib shared";
-
-  crossAttrs = {
-    preConfigure=''
-      export cross=$crossSystem-
-    '';
-    configureFlags="--libdir=lib ${opensslCrossSystem} shared";
-    buildPhase = ''
-      make CC=$crossConfig-gcc \
-        AR="$crossConfig-ar r" \
-        RANLIB=$crossConfig-ranlib
-    '';
-  };
-
-  meta = {
-    homepage = http://www.openssl.org/;
-    description = "A cryptographic library that implements the SSL and TLS protocols";
-  };
-}
-//
-(if stdenv.isDarwin then {
-  patches = ./darwin-arch.patch;
-}
-else { })
-)
diff --git a/pkgs/development/libraries/openssl/darwin-arch-1.patch b/pkgs/development/libraries/openssl/darwin-arch-1.patch
deleted file mode 100644
index ad8e86c6791e..000000000000
--- a/pkgs/development/libraries/openssl/darwin-arch-1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The patch is specific to nix: MacOS gcc supports -arch.
---- a/Configure
-+++ b/Configure
-@@ -549,9 +549,9 @@ my %table=(
- "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
- "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-
- ##### A/UX