diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-16 13:27:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 13:27:44 -0700 |
| commit | c42e624f30e2756269b49abed9361b4a8fcc3efc (patch) | |
| tree | ff28d5e8a61fb0806d3c37270ee00eeb3ce2e3c7 /pkgs/development/web | |
| parent | 92a114aa25bb9036aef4cd9a6d1e6e8732d2cab1 (diff) | |
| parent | 487a5e9b52c1ef233b93a8ce6b58d46aa306115c (diff) | |
| download | nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.tar nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.tar.gz nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.tar.bz2 nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.tar.lz nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.tar.xz nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.tar.zst nixlib-c42e624f30e2756269b49abed9361b4a8fcc3efc.zip | |
Merge pull request #292644 from NickCao/kore
kore: unpin openssl_1_1
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/kore/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 878737ce706f..13caf0e781fc 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }: + stdenv.mkDerivation rec { pname = "kore"; version = "4.2.3"; @@ -27,9 +28,14 @@ stdenv.mkDerivation rec { make platform.h ''; - # added to fix build w/gcc7 and clang5 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" - + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-error=pointer-compare" + "-Wno-error=discarded-qualifiers" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-pointer-types-discards-qualifiers" + ]); enableParallelBuilding = true; |