mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity

Merge pull request #50224 from volth/sed-windows

Browse source 
gnused: fix Windows build
This commit is contained in:
Jörg Thalheim 2018-11-11 10:53:04 +00:00 committed by GitHub
parent 7e345e064b 9d164580ba
commit 290eb75678
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/text/gnused/422.nix
View file

@ -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 = {

2
pkgs/tools/text/gnused/default.nix
View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
};
}

5
pkgs/top-level/all-packages.nix
View file

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