From af1cd2b8958122f91dfb1603965392ca2a085a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Sun, 24 Nov 2024 01:18:38 +0100 Subject: [PATCH] fix binary ext in derivation alt --- default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index afee01a2..47d94f37 100644 --- a/default.nix +++ b/default.nix @@ -33,10 +33,6 @@ let notmuch = pkgs.notmuch; gpgme = pkgs.gpgme; }; - - himalayaExe = - let ext = lib.optionalString hostPlatform.isWindows ".exe"; - in "${hostPlatform.emulator pkgs.buildPackages} ./himalaya${ext}"; in himalaya.overrideAttrs (drv: { @@ -50,12 +46,12 @@ himalaya.overrideAttrs (drv: { cp assets/himalaya-watch@.service $out/bin/share/services/ cd $out/bin - ${himalayaExe} man ./share/man - ${himalayaExe} completion bash > ./share/completions/himalaya.bash - ${himalayaExe} completion elvish > ./share/completions/himalaya.elvish - ${himalayaExe} completion fish > ./share/completions/himalaya.fish - ${himalayaExe} completion powershell > ./share/completions/himalaya.powershell - ${himalayaExe} completion zsh > ./share/completions/himalaya.zsh + ${hostPlatform.emulator pkgs.buildPackages} ./himalaya man ./share/man + ${hostPlatform.emulator pkgs.buildPackages} ./himalaya completion bash > ./share/completions/himalaya.bash + ${hostPlatform.emulator pkgs.buildPackages} ./himalaya completion elvish > ./share/completions/himalaya.elvish + ${hostPlatform.emulator pkgs.buildPackages} ./himalaya completion fish > ./share/completions/himalaya.fish + ${hostPlatform.emulator pkgs.buildPackages} ./himalaya completion powershell > ./share/completions/himalaya.powershell + ${hostPlatform.emulator pkgs.buildPackages} ./himalaya completion zsh > ./share/completions/himalaya.zsh ${lib.getExe pkgs.buildPackages.gnutar} -czf himalaya.tgz himalaya* share mv himalaya.tgz ../