diff options
| author | Naïm Favier <n@monade.li> | 2022-05-10 16:01:59 +0200 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-05-10 22:07:56 +0200 |
| commit | 62245943aa12a06cc976ca94c632d70049316415 (patch) | |
| tree | dbade7f687367eddd17e46f94caafb44a3e889b0 /pkgs/tools/security/cryptomator | |
| parent | 0d6bcb513bf2f2fe92ff8b2fae75da95007a03e3 (diff) | |
| download | nixpkgs-62245943aa12a06cc976ca94c632d70049316415.tar nixpkgs-62245943aa12a06cc976ca94c632d70049316415.tar.gz nixpkgs-62245943aa12a06cc976ca94c632d70049316415.tar.bz2 nixpkgs-62245943aa12a06cc976ca94c632d70049316415.tar.lz nixpkgs-62245943aa12a06cc976ca94c632d70049316415.tar.xz nixpkgs-62245943aa12a06cc976ca94c632d70049316415.tar.zst nixpkgs-62245943aa12a06cc976ca94c632d70049316415.zip | |
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.
Diffstat (limited to 'pkgs/tools/security/cryptomator')
| -rw-r--r-- | pkgs/tools/security/cryptomator/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 ]; |