mirror of
https://github.com/winapps-org/winapps.git
synced 2025-08-06 10:48:27 +02:00
fix(nix): correct build failure
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,3 @@
|
|||||||
/.idea
|
/.idea
|
||||||
/.vscode
|
/.vscode
|
||||||
/result
|
/result
|
||||||
|
|
||||||
|
@@ -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;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@@ -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 ];
|
||||||
|
Reference in New Issue
Block a user