colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292644 from NickCao/kore

Browse Source 
kore: unpin openssl_1_1
This commit is contained in:
Nick Cao 2024-03-16 13:27:44 -07:00 committed by GitHub
commit c42e624f30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/web/kore/default.nix
View File

@ -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;

4
pkgs/top-level/all-packages.nix
View File

@ -9749,9 +9749,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 { };