about summary refs log tree commit diff
diff options
context:
space:
mode:
authoréclairevoyant <848000+eclairevoyant@users.noreply.github.com>2024-02-02 16:11:10 -0500
committeréclairevoyant <848000+eclairevoyant@users.noreply.github.com>2024-02-02 16:11:10 -0500
commita876becb8baed79eb432e37f60daa5bf52d2055d (patch)
tree701d06f4680d23c0da59f4daf6f86d37e06d5667
parent5fd6c33068e0c63011559ec4711e26107e4d8b6b (diff)
gitkraken: fix wrapper for non-gnome environments
-rw-r--r--pkgs/applications/version-management/gitkraken/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 6b9ed9f25ccf4..538f0cc75c92b 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -109,6 +109,9 @@ let
     nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ];
     buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
 
+    # avoid double-wrapping
+    dontWrapGApps = true;
+
     installPhase = ''
       runHook preInstall
 
@@ -145,7 +148,9 @@ let
 
       # GitKraken expects the CA bundle to be located in the bundled git directory. Since we replace it with
       # the one from nixpkgs, which doesn't provide a CA bundle, we need to explicitly set its location at runtime
-      makeWrapper $out/share/${pname}/gitkraken $out/bin/gitkraken --set GIT_SSL_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt"
+      makeWrapper $out/share/${pname}/gitkraken $out/bin/gitkraken \
+        --set GIT_SSL_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+        "''${gappsWrapperArgs[@]}"
     '';
   };