lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

glibcLocales: support building on musl (#141971)

authored by

Yuka and committed by
GitHub
ba064979 cd900029

+10 -6
+4 -2
pkgs/development/libraries/glibc/common.nix
··· 37 37 , profilingLibraries ? false 38 38 , withGd ? false 39 39 , meta 40 + , extraBuildInputs ? [] 41 + , extraNativeBuildInputs ? [] 40 42 , ... 41 43 } @ args: 42 44 ··· 189 191 outputs = [ "out" "bin" "dev" "static" ]; 190 192 191 193 depsBuildBuild = [ buildPackages.stdenv.cc ]; 192 - nativeBuildInputs = [ bison python3Minimal ]; 193 - buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ]; 194 + nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs; 195 + buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; 194 196 195 197 # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to 196 198 # prevent a retained dependency on the bootstrap tools in the stdenv-linux
+4 -2
pkgs/development/libraries/glibc/locales.nix
··· 6 6 https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED 7 7 */ 8 8 9 - { lib, stdenv, buildPackages, callPackage, writeText 9 + { lib, stdenv, buildPackages, callPackage, writeText, glibc 10 10 , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] 11 11 }: 12 12 ··· 17 17 18 18 outputs = [ "out" ]; 19 19 20 + extraNativeBuildInputs = [ glibc ]; 21 + 20 22 # Awful hack: `localedef' doesn't allow the path to `locale-archive' 21 23 # to be overriden, but you *can* specify a prefix, i.e. it will use 22 24 # <prefix>/<path-to-glibc>/lib/locale/locale-archive. So we use ··· 24 26 # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. 25 27 buildPhase = 26 28 '' 27 - mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" 29 + mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale" 28 30 29 31 echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED 30 32
+2 -2
pkgs/top-level/all-packages.nix
··· 16250 16250 16251 16251 relibc = callPackage ../development/libraries/relibc { }; 16252 16252 16253 - # Only supported on Linux, using glibc 16254 - glibcLocales = if stdenv.hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null; 16253 + # Only supported on Linux 16254 + glibcLocales = if stdenv.hostPlatform.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; 16255 16255 16256 16256 glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; 16257 16257