about 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>2016-02-18 21:11:15 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-18 21:11:15 +0100
commit1ab14aad7ad61fead6bc93145d1169eca91d7b91 (patch)
treef1ea3ac532c29c515de27ecd0399f720a3d9617d /pkgs/top-level/all-packages.nix
parentf98a5946b7607ac7541b0122e73c9b9fec69a981 (diff)
downloadnixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.tar
nixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.tar.gz
nixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.tar.bz2
nixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.tar.lz
nixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.tar.xz
nixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.tar.zst
nixlib-1ab14aad7ad61fead6bc93145d1169eca91d7b91.zip
glibc: Drop hurd support
This hasn't been maintained since 2012.

Also, renamed glibc's kernelHeaders argument to linuxHeaders.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf296423..4cce2e159130 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6707,22 +6707,18 @@ let
   glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
 
   glibc = callPackage ../development/libraries/glibc {
-    kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
-    machHeaders = null;
-    hurdHeaders = null;
     gccCross = null;
   };
 
   glibc_memusage = callPackage ../development/libraries/glibc {
-    kernelHeaders = linuxHeaders;
     installLocales = false;
     withGd = true;
   };
 
   glibcCross = forceNativeDrv (glibc.override {
     gccCross = gccCrossStageStatic;
-    kernelHeaders = linuxHeadersCross;
+    linuxHeaders = linuxHeadersCross;
   });
 
   # We can choose: