6 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gettext/0.14.6.nix b/pkgs/development/libraries/gettext/0.14.6.nix
index fefa8dbe5c7..bceacd318ec 100644
--- a/pkgs/development/libraries/gettext/0.14.6.nix
+++ b/pkgs/development/libraries/gettext/0.14.6.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "gettext-0.14.6";
   src = fetchurl {
     url = mirror://gnu/gettext/gettext-0.14.6.tar.gz;
diff --git a/pkgs/development/libraries/gettext/0.15.nix b/pkgs/development/libraries/gettext/0.15.nix
index fec9c348afc..0c417aafe50 100644
--- a/pkgs/development/libraries/gettext/0.15.nix
+++ b/pkgs/development/libraries/gettext/0.15.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "gettext-0.15";
   src = fetchurl {
     url = mirror://gnu/gettext/gettext-0.15.tar.gz;
diff --git a/pkgs/development/libraries/gettext/0.16.x.nix b/pkgs/development/libraries/gettext/0.16.x.nix
index 9e832889e42..d9b8cabef1d 100644
--- a/pkgs/development/libraries/gettext/0.16.x.nix
+++ b/pkgs/development/libraries/gettext/0.16.x.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "gettext-0.16.1";
   src = fetchurl {
     url = mirror://gnu/gettext/gettext-0.16.1.tar.gz;
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 10d1ced407f..e98d365022f 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,7 +1,8 @@
 args:
-builtins.listToAttrs [
-	{ name = "recurseForDerivations"; value = true; }
-	{ name = "0.14.6"; value = (import ./0.14.6.nix) args; }
-	{ name = "0.15"; value = (import ./0.15.nix) args; }
-	{ name = "0.16.x"; value = (import ./0.16.x.nix) args; }
+args.lib.listOfListsToAttrs [
+	[ "recurseForDerivations" true ]
+	[ "0.14.6" (import ./0.14.6.nix args) ]
+	[ "0.15" (import ./0.15.nix args) ]
+	[ "0.16.x" (import ./0.16.x.nix args) ]
+	[ "default" (import ./0.16.x.nix args) ]
 ]
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index 5a906b5821c..87d08ab7c1c 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -9,6 +9,7 @@ let
 in
 
 rec {
+  listOfListsToAttrs = ll : builtins.listToAttrs (map (l : { name = (head l); value = (head (tail l)); }) ll);
 
 
   # Identity function.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79ea38c7e1e..d94449af396 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1908,7 +1908,7 @@ rec {
   gettext = getVersion "gettext" gettext_alts;
 
   gettext_alts = import ../development/libraries/gettext {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv lib;
   };
 
   gd = import ../development/libraries/gd {