diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-11 14:46:46 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-11 14:47:48 -0400 |
| commit | 1b46c4b2a463aa22f68260d2f96506e9cb817a18 (patch) | |
| tree | 1e5752e399449ccc19e4815f7b6add46bf337106 /pkgs | |
| parent | d64b85983bf0eee87f47733c8e80709f8f7dd0a7 (diff) | |
| download | nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.tar nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.tar.gz nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.tar.bz2 nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.tar.lz nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.tar.xz nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.tar.zst nixlib-1b46c4b2a463aa22f68260d2f96506e9cb817a18.zip | |
click: fix locale in darwin
unixtools.locale is used
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/click/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 295c6d51955d..4a96ef7f6730 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, glibc, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: buildPythonPackage rec { pname = "click"; @@ -9,11 +9,12 @@ buildPythonPackage rec { sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; - patches = stdenv.lib.optionals (stdenv.isLinux && !stdenv.hostPlatform.isMusl) + patches = [ (substituteAll { src = ./fix-paths.patch; - locale = "${glibc.bin}/bin/locale"; - }); + locale = "${locale}/bin/locale"; + }) + ]; buildInputs = [ pytest ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0884fe5688c..b6d0f3695321 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21639,7 +21639,7 @@ with pkgs; unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl getconf - getent; + getent locale; fts = if hostPlatform.isMusl then netbsd.fts else null; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 1bcf93754cd7..362715e82623 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -85,6 +85,7 @@ let }; locale = { linux = pkgs.glibc; + darwin = pkgs.netbsd.locale; }; logger = { linux = pkgs.utillinux; |