From ebf3a404f6bcacbabb81cb141ad614bcd52752b1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 16 Jan 2023 19:29:45 +0100 Subject: [PATCH] gmnisrv: don't pin to openssl_1_1 --- pkgs/servers/gemini/gmnisrv/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index 81e1c17467c..d37a7247ecf 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; }; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + ]; + postPatch = '' substituteInPlace config.sh \ --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0270750dbf8..97dc83a96f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3153,9 +3153,7 @@ with pkgs; gmni = callPackage ../applications/networking/browsers/gmni { }; - gmnisrv = callPackage ../servers/gemini/gmnisrv { - openssl = openssl_1_1; - }; + gmnisrv = callPackage ../servers/gemini/gmnisrv { }; gmnitohtml = callPackage ../applications/misc/gmnitohtml { };