From a648ad2cd7374c222eebce127a194997949ae033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Tue, 13 Jan 2026 00:42:21 +0100 Subject: [PATCH] build(nix): fix windows build --- default.nix | 22 ++++++++++++++-------- flake.lock | 12 ++++++------ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/default.nix b/default.nix index 9a13052d..ad09ba10 100644 --- a/default.nix +++ b/default.nix @@ -12,6 +12,7 @@ pimalaya.mkDefault ( { lib, pkgs, + buildPackages, rustPlatform, defaultFeatures, features, @@ -21,23 +22,28 @@ pimalaya.mkDefault ( buildNoDefaultFeatures = !defaultFeatures; buildFeatures = lib.splitString "," features; }) - # HACK: needed until new derivation available on nixpkgs + # HACK: needed until new derivation available on nixpkgs's + # master branch .overrideAttrs { postInstall = let - inherit (pkgs) stdenv buildPackages; + inherit (pkgs) stdenv; emulator = stdenv.hostPlatform.emulator buildPackages; + exe = stdenv.hostPlatform.extensions.executable; in + lib.optionalString (lib.hasInfix "wine" emulator) '' + wineboot --init '' + + '' mkdir -p $out/share/{applications,completions,man} cp assets/himalaya.desktop "$out"/share/applications/ - ${emulator} "$out"/bin/himalaya man "$out"/share/man - ${emulator} "$out"/bin/himalaya completion bash > "$out"/share/completions/himalaya.bash - ${emulator} "$out"/bin/himalaya completion elvish > "$out"/share/completions/himalaya.elvish - ${emulator} "$out"/bin/himalaya completion fish > "$out"/share/completions/himalaya.fish - ${emulator} "$out"/bin/himalaya completion powershell > "$out"/share/completions/himalaya.powershell - ${emulator} "$out"/bin/himalaya completion zsh > "$out"/share/completions/himalaya.zsh + ${emulator} "$out"/bin/himalaya${exe} man "$out"/share/man + ${emulator} "$out"/bin/himalaya${exe} completion bash > "$out"/share/completions/himalaya.bash + ${emulator} "$out"/bin/himalaya${exe} completion elvish > "$out"/share/completions/himalaya.elvish + ${emulator} "$out"/bin/himalaya${exe} completion fish > "$out"/share/completions/himalaya.fish + ${emulator} "$out"/bin/himalaya${exe} completion powershell > "$out"/share/completions/himalaya.powershell + ${emulator} "$out"/bin/himalaya${exe} completion zsh > "$out"/share/completions/himalaya.zsh '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installManPage "$out"/share/man/* diff --git a/flake.lock b/flake.lock index c1ed20c5..d808faec 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1759301100, - "narHash": "sha256-hmiTEoVAqLnn80UkreCNunnRKPucKvcg5T4/CELEtbw=", + "lastModified": 1767250179, + "narHash": "sha256-PnQdWvPZqHp+7yaHWDFX3NYSKaOy0fjkwpR+rIQC7AY=", "owner": "nix-community", "repo": "fenix", - "rev": "0956bc5d1df2ea800010172c6bc4470d9a22cb81", + "rev": "a3eaf682db8800962943a77ab77c0aae966f9825", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "pimalaya": { "flake": false, "locked": { - "lastModified": 1767900157, - "narHash": "sha256-odSDfA4npCXhO/PimEbRe15KY+NPkCtTKLeiIBX1alc=", + "lastModified": 1768259669, + "narHash": "sha256-JAxHFfetosj3kXhVYsACdcNuZ/pzKrZgMMRrBGm8E/k=", "owner": "pimalaya", "repo": "nix", - "rev": "a6ca8acb17d2dcd9312c53f8e07fb510769c28e1", + "rev": "5c219b3ea00eac8b1a833d24d2ce61a801345c32", "type": "github" }, "original": {