summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2007-11-12 13:51:46 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2007-11-12 13:51:46 +0000
commit7a424b47f612b1361471974a70bd88d1ca4cfe22 (patch)
tree1860daee6b02a7e5da5f143521ccb4d3e0e8308f /pkgs/top-level/all-packages.nix
parent93ce7c7a694fa80f41635ead7b335263529cfa38 (diff)
downloadnixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar
nixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.gz
nixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.bz2
nixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.lz
nixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.xz
nixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.zst
nixpkgs-7a424b47f612b1361471974a70bd88d1ca4cfe22.zip
* Revert the setup hook changes on the trunk (but they remain on the
  stdenv-updates branch).

svn path=/nixpkgs/trunk/; revision=9652
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e7539fa23d..13c27a6463d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2146,7 +2146,7 @@ rec {
   };
 
   openssl = import ../development/libraries/openssl {
-    inherit fetchurl stdenv perl gmp;
+    inherit fetchurl stdenv perl;
   };
 
   pangoxsl = import ../development/libraries/pangoxsl {
@@ -3604,7 +3604,7 @@ rec {
 
   elinks = import ../applications/networking/browsers/elinks {
     inherit stdenv fetchurl python perl ncurses x11 zlib openssl spidermonkey
-	guile bzip2 libtool;
+	guile bzip2;
   };
 
   emacs = emacs22;