summary refs log tree commit diff
path: root/pkgs/system/all-packages-generic.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2005-04-11 08:26:36 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2005-04-11 08:26:36 +0000
commit1af17b9d7ff154bb65f15905c9e4c8a7a427aa00 (patch)
treedbc564bc76ed4d22d6f3cb4dd3b37cb1e14e85d3 /pkgs/system/all-packages-generic.nix
parentd8a0bdebf2e20d10f859a21004e16589d086974c (diff)
downloadnixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.tar
nixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.tar.gz
nixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.tar.bz2
nixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.tar.lz
nixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.tar.xz
nixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.tar.zst
nixpkgs-1af17b9d7ff154bb65f15905c9e4c8a7a427aa00.zip
* Rename new unzip.
svn path=/nixpkgs/trunk/; revision=2515
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r--pkgs/system/all-packages-generic.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index af444eb87a4..6ea3663e828 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -90,14 +90,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  # !!! fix this
-  unzip = if stdenv.system == "i686-linux" then unzip550 else unzip552;
-
-  unzip550 = (import ../tools/archivers/unzip) {
-    inherit fetchurl stdenv;
-  };
-
-  unzip552 = (import ../tools/archivers/unzip-5.52) {
+  unzip = import ../tools/archivers/unzip {
     inherit fetchurl stdenv;
   };