diff --git a/.gitignore b/.gitignore index 907f156..c000e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /.idea /.vscode /result - diff --git a/flake.nix b/flake.nix index 86ec7d7..c8dc940 100644 --- a/flake.nix +++ b/flake.nix @@ -31,11 +31,13 @@ let pkgs = import nixpkgs { inherit system; }; in - { + rec { formatter = pkgs.nixfmt-rfc-style; 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; + }; } ); } diff --git a/packages/winapps-launcher/default.nix b/packages/winapps-launcher/default.nix index bb45e7d..c353a86 100644 --- a/packages/winapps-launcher/default.nix +++ b/packages/winapps-launcher/default.nix @@ -4,8 +4,8 @@ fetchFromGitHub, makeWrapper, makeDesktopItem, - callPackage, yad, + winapps ? throw "Pass in the winapps package", ... }: let @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ yad - (callPackage ../winapps { }) + winapps ]; patches = [ ./WinApps-Launcher.patch ];