diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/gettext | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gettext')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gettext/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 96a025976c78..9230c27a3c1f 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -59,9 +59,13 @@ stdenv.mkDerivation rec { xz xz.bin ]; - buildInputs = [ bash ] - # HACK, see #10874 (and 14664) - ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ + bash + ] + ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ + # HACK, see #10874 (and 14664) + libiconv + ]; setupHooks = [ ../../../build-support/setup-hooks/role.bash |