summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-03-30 15:31:47 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-03-30 15:31:47 +0000
commit0a4dd9c4d9528bf742b8d223dab4a3b661e8f238 (patch)
tree4308d21f52dcf26bd120d04be169086ef0194dbc
parent7104e93859cbaba1537ad860e03fa87593e2ebce (diff)
* pam_console needs an old libtool.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14791
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35ea65ff3b841..79b15f7a5d7b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2456,11 +2456,13 @@ let
     inherit fetchurl stdenv perl;
   };
 
+  libtool = libtool_2;
+
   libtool_1_5 = import ../development/tools/misc/libtool {
     inherit fetchurl stdenv perl m4;
   };
 
-  libtool = import ../development/tools/misc/libtool/libtool2.nix {
+  libtool_2 = import ../development/tools/misc/libtool/libtool2.nix {
     inherit fetchurl stdenv lzma perl m4;
   };
 
@@ -7183,7 +7185,8 @@ let
   };
 
   pam_console = import ../os-specific/linux/pam_console {
-    inherit stdenv fetchurl pam autoconf automake libtool pkgconfig bison;
+    inherit stdenv fetchurl pam autoconf automake pkgconfig bison;
+    libtool = libtool_1_5;
     flex = if stdenv.system == "i686-linux" then flex else flex2533;
     inherit (gtkLibs) glib;
   };