diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-21 17:04:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 17:04:20 -0400 |
| commit | 916f096911162ea4c85f3fb2eed5af8785abf925 (patch) | |
| tree | 6d1a37cd15afb34dff9cb416ea99a39392ad513d /pkgs/tools | |
| parent | e975814b19ba8cb8052a60f18de2ee4aebe1190b (diff) | |
| parent | b98b4eac71cfb0ccedc6d909fd58058bc1cb85e7 (diff) | |
| download | nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.gz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.bz2 nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.lz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.xz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.zst nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.zip | |
Merge pull request #43890 from matthewbauer/mingw-fixes
Mingw fixes
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/file/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index aeb43d7c1151..485f46d03144 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, zlib }: +{ stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { name = "file-${version}"; @@ -13,10 +13,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; + makeFlags = if stdenv.hostPlatform.isWindows then "FILE_COMPILE=file" + else null; meta = with stdenv.lib; { homepage = http://darwinsys.com/file; |