diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-12-15 21:30:37 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:26 -0600 |
| commit | a868bf379727628e55eb30d872c5c6b5c91fba1b (patch) | |
| tree | f0b2f4146cfd5e1e072d78ff4d1f87ebbb3305f1 /pkgs/development/libraries/glibc | |
| parent | d72c4c694ffac76d8cc20813c8b9dc2a11ad46a9 (diff) | |
| download | nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.tar nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.tar.gz nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.tar.bz2 nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.tar.lz nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.tar.xz nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.tar.zst nixpkgs-a868bf379727628e55eb30d872c5c6b5c91fba1b.zip | |
glibc: Fix cross-compilation of locales
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/locales.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index b17d4effb1e..d40733adf87 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -222,6 +222,6 @@ stdenv.mkDerivation ({ # To avoid a dependency on the build system 'bash'. preFixup = '' - rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} + rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace} ''; }) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index debd7b39c86..7090c5cecee 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,7 +6,7 @@ https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED */ -{ stdenv, callPackage, writeText +{ stdenv, buildPackages, callPackage, writeText , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: @@ -26,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } { # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. buildPhase = '' - mkdir -p $TMPDIR/"${stdenv.cc.libc.out}/lib/locale" + mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile |