From 62245943aa12a06cc976ca94c632d70049316415 Mon Sep 17 00:00:00 2001
From: Naïm Favier <n@monade.li>
Date: Tue, 10 May 2022 16:01:59 +0200
Subject: makeWrapper,makeBinaryWrapper: introduce explicitly named functions

Because both versions might end up in a derivation's build inputs, it
might be useful to be able to explicitly select which function to use.
---
 pkgs/tools/security/cryptomator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools/security')

diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix
index 5a1886e49e5..9517427fefd 100644
--- a/pkgs/tools/security/cryptomator/default.nix
+++ b/pkgs/tools/security/cryptomator/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
     rm $out/share/cryptomator/libs/jff*.jar
     cp -f ${jffi}/share/java/jffi-complete.jar $out/share/cryptomator/libs/
 
-    makeWrapper ${jre}/bin/java $out/bin/cryptomator \
+    makeShellWrapper ${jre}/bin/java $out/bin/cryptomator \
       --add-flags "--class-path '$out/share/cryptomator/libs/*'" \
       --add-flags "--module-path '$out/share/cryptomator/mods'" \
       --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \
@@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
     autoPatchelfHook
     maven
     makeWrapper
-    (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; })
+    wrapGAppsHook
     jdk
   ];
   buildInputs = [ fuse jre glib jffi ];
-- 
cgit 1.4.1