Merge pull request #211127 from helsinki-systems/gmnisrv-ossl3

gmnisrv: don't pin to openssl_1_1
This commit is contained in:
Mario Rodas 2023-01-23 20:59:32 -05:00 committed by GitHub
commit 38fd0e1d14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View file

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ=";
}; };
NIX_CFLAGS_COMPILE = [
"-Wno-error=deprecated-declarations"
];
postPatch = '' postPatch = ''
substituteInPlace config.sh \ substituteInPlace config.sh \
--replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config"

View file

@ -3165,9 +3165,7 @@ with pkgs;
gmni = callPackage ../applications/networking/browsers/gmni { }; gmni = callPackage ../applications/networking/browsers/gmni { };
gmnisrv = callPackage ../servers/gemini/gmnisrv { gmnisrv = callPackage ../servers/gemini/gmnisrv { };
openssl = openssl_1_1;
};
gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; gmnitohtml = callPackage ../applications/misc/gmnitohtml { };