diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-09-22 17:12:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 17:12:10 -0500 |
| commit | 3bc7ad936470dfdf88da527d6d54a3aaf6a56437 (patch) | |
| tree | b89b62069c8777b22abfe5623aa1cd9c9e48533d /pkgs/tools/compression/brotli | |
| parent | 52a1179b6c20e923beddde1dd1e0034aa19176d2 (diff) | |
| parent | e4f196810098ba7fce635705a9e6a1298665a27b (diff) | |
| download | nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.tar nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.tar.gz nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.tar.bz2 nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.tar.lz nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.tar.xz nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.tar.zst nixlib-3bc7ad936470dfdf88da527d6d54a3aaf6a56437.zip | |
Merge pull request #46773 from mcmtroffaes/feature/fix-brotli-mingw
brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw cross builds
Diffstat (limited to 'pkgs/tools/compression/brotli')
| -rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index db5d1f216054..754c0e581563 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = stdenv.lib.optional + (stdenv.hostPlatform.libc == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; + outputs = [ "out" "dev" "lib" ]; doCheck = true; |