diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/tools/compression/zstd | |
parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/tools/compression/zstd')
-rw-r--r-- | nixpkgs/pkgs/tools/compression/zstd/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index 6394ea3338d1..e890518a45a9 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -36,13 +36,15 @@ stdenv.mkDerivation rec { tests/playTests.sh ''; - cmakeFlags = [ - "-DZSTD_BUILD_SHARED:BOOL=${if (!static) then "ON" else "OFF"}" - "-DZSTD_BUILD_STATIC:BOOL=${if static then "ON" else "OFF"}" - "-DZSTD_PROGRAMS_LINK_SHARED:BOOL=${if (!static) then "ON" else "OFF"}" - "-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}" - "-DZSTD_BUILD_TESTS:BOOL=ON" - ]; + cmakeFlags = lib.attrsets.mapAttrsToList + (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { + BUILD_SHARED = !static; + BUILD_STATIC = static; + PROGRAMS_LINK_SHARED = !static; + LEGACY_SUPPORT = legacySupport; + BUILD_TESTS = doCheck; + }; + cmakeDir = "../build/cmake"; dontUseCmakeBuildDir = true; preConfigure = '' @@ -50,7 +52,7 @@ stdenv.mkDerivation rec { ''; checkInputs = [ file ]; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkPhase = '' runHook preCheck # Patch shebangs for playTests |