From 487a5e9b52c1ef233b93a8ce6b58d46aa306115c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Mar 2024 14:54:01 -0500 Subject: kore: unpin openssl_1_1 --- pkgs/development/web/kore/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pkgs/development/web') diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 878737ce706fd..13caf0e781fc3 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; -- cgit 1.4.1