Merge pull request #211127 from helsinki-systems/gmnisrv-ossl3
gmnisrv: don't pin to openssl_1_1
This commit is contained in:
commit
38fd0e1d14
2 changed files with 5 additions and 3 deletions
|
@ -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"
|
||||||
|
|
|
@ -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 { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue