diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index ada9d599d51..34883ad0042 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,13 +1,17 @@
-{stdenv, fetchurl, perl, bison, mktemp, kernel}:
+{stdenv, fetchurl, perl, bison, mktemp, kernel
+  , version ? "1.5"
+  , sha256 ?  "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017"
+  , subdir ? ""
+}:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "klibc-1.5";
+  name = "klibc-${version}";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://kernel/linux/libs/klibc/klibc-1.5.tar.bz2;
-    sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017";
+    url = "mirror://kernel/linux/libs/klibc/${subdir}klibc-${version}.tar.bz2";
+    inherit sha256;
 #    url = mirror://kernel/linux/libs/klibc/Testing/klibc-1.5.14.tar.bz2;
 #    sha256 = "1cmrqpgamnv2ns7dlxjm61zc88dxm4ff0aya413ij1lmhp2h2sfc";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a29044e43e3..534348667fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5210,9 +5210,9 @@ let pkgs = rec {
 
     # Actually, klibc builds fine with the static kernelHeaders, but
     # splashutils expects a klibc with patched headers...
-    klibc = import ../os-specific/linux/klibc {
+    klibc = composedArgsAndFun (import ../os-specific/linux/klibc) {
       inherit fetchurl stdenv perl bison mktemp kernel;
-    };
+    } null;
 
     klibcShrunk = import ../os-specific/linux/klibc/shrunk.nix {
       inherit stdenv klibc;