diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-06-24 00:37:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-24 00:37:37 +0200 |
| commit | 822504c5cacddb19ed67402aeed019c690307bf9 (patch) | |
| tree | 45ef047061b08195bb151b589796776bc55db572 | |
| parent | Merge pull request #178635 from NixOS/backport-178462-to-staging-22.05 (diff) | |
| parent | libzip: Fix static build (diff) | |
| download | nixpkgs-822504c5cacddb19ed67402aeed019c690307bf9.tar.gz | |
Merge pull request #178765 from NixOS/backport-178755-to-staging-22.05
[Backport staging-22.05] Fix pkgsStatic.libzip
| -rw-r--r-- | pkgs/development/libraries/libzip/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 3620943d6c53..f794868baf0d 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withOpenssl [ openssl ] ++ lib.optionals withZstd [ zstd ]; + # Don't build the regression tests because they don't build with + # pkgsStatic and are not executed anyway. + cmakeFlags = [ "-DBUILD_REGRESS=0" ]; + preCheck = '' # regress/runtest is a generated file patchShebangs regress |