refactor(pkgs/yuzu-early-access): merge its dependencies into a singl…

…e folder
wrvsrx · May 5, 2024 · a5386f7 · a5386f7
1 parent 8c27925
commit a5386f7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/pkgs/to-normal-packages/default.nix b/pkgs/to-normal-packages/default.nix
@@ -43,9 +43,11 @@ rec {
   yalantinglibs = callPackage ./yalantinglibs { source = sources.yalantinglibs; };
   nx_tzdb = callPackage ./nx_tzdb { source = sources.nx_tzdb; };
   compat-list = callPackage ./compat-list { source = sources.compat-list; };
-  yuzu-early-access = qt6Packages.callPackage ./yuzu-earyly-access {
-    source = sources.yuzu;
-    inherit nx_tzdb compat-list;
+  yuzu-early-access = import ./yuzu {
+    sources = {
+      inherit (sources) yuzu nx_tzdb compat-list;
+    };
+    inherit pkgs;
   };
 
   # my packages

diff --git a/...o-normal-packages/compat-list/default.nix → ...mal-packages/yuzu/compat-list/default.nix b/...o-normal-packages/compat-list/default.nix → ...mal-packages/yuzu/compat-list/default.nix
diff --git a/pkgs/to-normal-packages/yuzu/default.nix b/pkgs/to-normal-packages/yuzu/default.nix
@@ -0,0 +1,11 @@
+{ sources, pkgs }:
+let
+  inherit (pkgs) callPackage qt6Packages;
+  nx_tzdb = callPackage ./nx_tzdb { source = sources.nx_tzdb; };
+  compat-list = callPackage ./compat-list { source = sources.compat-list; };
+  yuzu = qt6Packages.callPackage ./yuzu {
+    source = sources.yuzu;
+    inherit nx_tzdb compat-list;
+  };
+in
+yuzu
diff --git a/pkgs/to-normal-packages/nx_tzdb/default.nix → ...-normal-packages/yuzu/nx_tzdb/default.nix b/pkgs/to-normal-packages/nx_tzdb/default.nix → ...-normal-packages/yuzu/nx_tzdb/default.nix
diff --git a/...l-packages/yuzu-earyly-access/default.nix → .../to-normal-packages/yuzu/yuzu/default.nix b/...l-packages/yuzu-earyly-access/default.nix → .../to-normal-packages/yuzu/yuzu/default.nix