diff options
| author | volth <volth@volth.com> | 2018-11-11 06:57:28 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2018-11-11 06:58:15 +0000 |
| commit | 9d164580ba468efb1ec1b892ee5fc49109c33112 (patch) | |
| tree | 361276f6e5d25a41d086984b7bf00ffb96bff960 | |
| parent | 0ae3b49bb4222d52c34722a5b35ce30e0309bef4 (diff) | |
| download | nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.tar nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.tar.gz nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.tar.bz2 nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.tar.lz nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.tar.xz nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.tar.zst nixlib-9d164580ba468efb1ec1b892ee5fc49109c33112.zip | |
gnused: fix Windows build
| -rw-r--r-- | pkgs/tools/text/gnused/422.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gnused/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 037c2f17a63b..16d4f20fe8e7 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; + configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; + outputs = [ "out" "info" ]; meta = { diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index af3db54e96d5..4bdddb8c50b7 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed395ea8d4ad..222d73f40051 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2964,7 +2964,10 @@ with pkgs; gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { }; - gnused = callPackage ../tools/text/gnused { }; + gnused = if !stdenv.hostPlatform.isWindows then + callPackage ../tools/text/gnused { } # broken on Windows + else + gnused_422; # This is an easy work-around for [:space:] problems. gnused_422 = callPackage ../tools/text/gnused/422.nix { }; |