nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

click: fix locale in darwin

Browse Source 
unixtools.locale is used
This commit is contained in:
Matthew Bauer 2018-06-11 14:46:46 -04:00
parent d64b85983b
commit 1b46c4b2a4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/click/default.nix
View File

@ -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 ];

2
pkgs/top-level/all-packages.nix
View File

@ -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;

1
pkgs/top-level/unix-tools.nix
View File

@ -85,6 +85,7 @@ let
};
locale = {
linux = pkgs.glibc;
darwin = pkgs.netbsd.locale;
};
logger = {
linux = pkgs.utillinux;