From 65a512daf3e755852a8138fed6ee0fa4a984d19b Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Fri, 28 Apr 2023 17:50:49 -0400 Subject: [PATCH 1/3] remmina: Use the system's cert store --- pkgs/applications/networking/remote/remmina/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a76bad22c9e2..67882e992cee 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( + --set SSL_CERT_DIR : "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; From 9f805a40876f52643fd0543fe3bbe5b93b257dba Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Sun, 7 May 2023 13:13:33 -0400 Subject: [PATCH 2/3] Set doesn't take a colon --- pkgs/applications/networking/remote/remmina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 67882e992cee..96585b9fa127 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set SSL_CERT_DIR : "/etc/ssl/certs/" + --set SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; From fdfe19932f5b92662b9d2c8c6a6902cb06b3debd Mon Sep 17 00:00:00 2001 From: Levi Gross Date: Wed, 10 May 2023 10:08:51 -0400 Subject: [PATCH 3/3] Use `set-default` so that we don't override the exisiting environment variable --- pkgs/applications/networking/remote/remmina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 96585b9fa127..6653e1ac3512 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set SSL_CERT_DIR "/etc/ssl/certs/" + --set-default SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) '';