fix(nix): correct build failure

This commit is contained in:
Oskar Manhart
2025-07-22 18:24:10 +02:00
parent 4010972963
commit 03dff50916
3 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,3 @@
/.idea /.idea
/.vscode /.vscode
/result /result

View File

@@ -31,11 +31,13 @@
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
in in
{ rec {
formatter = pkgs.nixfmt-rfc-style; formatter = pkgs.nixfmt-rfc-style;
packages.winapps = pkgs.callPackage ./packages/winapps { inherit nix-filter; }; packages.winapps = pkgs.callPackage ./packages/winapps { inherit nix-filter; };
packages.winapps-launcher = pkgs.callPackage ./packages/winapps-launcher { }; packages.winapps-launcher = pkgs.callPackage ./packages/winapps-launcher {
inherit (packages) winapps;
};
} }
); );
} }

View File

@@ -4,8 +4,8 @@
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeWrapper,
makeDesktopItem, makeDesktopItem,
callPackage,
yad, yad,
winapps ? throw "Pass in the winapps package",
... ...
}: }:
let let
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ buildInputs = [
yad yad
(callPackage ../winapps { }) winapps
]; ];
patches = [ ./WinApps-Launcher.patch ]; patches = [ ./WinApps-Launcher.patch ];