diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-01 14:54:01 -0500 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2024-03-01 14:54:01 -0500 |
| commit | 487a5e9b52c1ef233b93a8ce6b58d46aa306115c (patch) | |
| tree | 074c7cd0f4d744e3423fd8b8feb157d88e1ce3ef | |
| parent | 8fdcb826154d5aac4642a97a4b8c9241e2a16dc8 (diff) | |
| download | nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.tar nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.tar.gz nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.tar.bz2 nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.tar.lz nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.tar.xz nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.tar.zst nixlib-487a5e9b52c1ef233b93a8ce6b58d46aa306115c.zip | |
kore: unpin openssl_1_1
| -rw-r--r-- | pkgs/development/web/kore/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 6 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8989e3257c22..20ee62ed225d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9785,9 +9785,7 @@ with pkgs; kool = callPackage ../development/tools/misc/kool { }; - kore = callPackage ../development/web/kore { - openssl = openssl_1_1; - }; + kore = callPackage ../development/web/kore { }; krakenx = callPackage ../tools/system/krakenx { }; |