kore: unpin openssl_1_1
This commit is contained in:
parent
8fdcb82615
commit
487a5e9b52
2 changed files with 10 additions and 6 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue