diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
commit | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (patch) | |
tree | 4d64a15e34e8a2b54466ba165297a6bb08bfb280 /pkgs/tools/compression | |
parent | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (diff) | |
parent | 2be707eca80b573c931007de78c936d49ab45395 (diff) | |
download | nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.gz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.bz2 nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.lz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.xz nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.zst nixlib-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.zip |
Merge branch 'master' into staging-next
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index f4f0ac41563a..62873569aae1 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }: +{ stdenv, fetchFromGitHub, cmake, fetchpatch +, staticOnly ? stdenv.hostPlatform.isStatic +}: # ?TODO: there's also python lib in there diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 913a94e1a003..b7e068330a13 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -2,7 +2,7 @@ , fixDarwinDylibNames , file , legacySupport ? false -, static ? false +, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { |