summary refs log tree commit diff
path: root/pkgs/development/libraries/glibc
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-08-29 00:24:47 +0000
committerRobin Gloster <mail@glob.in>2016-08-29 00:24:47 +0000
commite17bc259434c180a85ac4fd4bca1556f4702dabf (patch)
treeff2cbbd2746f80fa4847060dce92a71a599aa875 /pkgs/development/libraries/glibc
parent2958ec7d6fe1fb7c5e90bac0b3164df5b4c177cc (diff)
parentc004c6e14d00845f9ee15f0f992eb06325f1bdd8 (diff)
downloadnixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar
nixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.gz
nixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.bz2
nixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.lz
nixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.xz
nixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.tar.zst
nixpkgs-e17bc259434c180a85ac4fd4bca1556f4702dabf.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r--pkgs/development/libraries/glibc/common.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d7e91642342..3ee9d2289ac 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -181,6 +181,6 @@ stdenv.mkDerivation ({
     license = lib.licenses.lgpl2Plus;
 
     maintainers = [ lib.maintainers.eelco ];
-    #platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux;
   } // meta;
 })