fix(pkgs/yuzu): fix source

wrvsrx · May 5, 2024 · f52e325 · f52e325
1 parent 0ed7052
commit f52e325
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 49 deletions.
diff --git a/pkgs/to-normal-packages/yuzu/default.nix b/pkgs/to-normal-packages/yuzu/default.nix
@@ -3,9 +3,6 @@ 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.suyu;
-    inherit nx_tzdb compat-list;
-  };
+  yuzu = qt6Packages.callPackage ./yuzu { inherit nx_tzdb compat-list; };
 in
 yuzu
diff --git a/pkgs/to-normal-packages/yuzu/yuzu/default.nix b/pkgs/to-normal-packages/yuzu/yuzu/default.nix
@@ -33,16 +33,30 @@
   yasm,
   zlib,
   zstd,
-  gitMinimal,
-  source,
+  fetchgit,
+  coreutils,
 }:
+let
+  src = fetchgit {
+    url = "https://git.suyu.dev/suyu/suyu";
+    rev = "42f3dd309e8d89aef74344c5a66d0d1c7d7789a4";
+    fetchSubmodules = true;
+    deepClone = true;
+    leaveDotGit = true;
+    sha256 = "sha256-LsVLOGWVuuMgi7ZrZgPh+JRTv4NEGOqM1Hp6X62zItE=";
+    postFetch = ''
+      ${coreutils}/bin/env --chdir=$out git reset 15e6e48bef0216480661444a8d8b348c1cca47bb --hard
+      ${coreutils}/bin/env --chdir=$out git submodule update
+      rm -rf $out/.git
+    '';
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "yuzu";
   version = "4716";
-  inherit (source) src;
+  inherit src;
 
   nativeBuildInputs = [
-    gitMinimal
     cmake
     glslang
     pkg-config
@@ -134,8 +148,6 @@ stdenv.mkDerivation (finalAttrs: {
   qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" ];
 
   preConfigure = ''
-    git reset 15e6e48bef0216480661444a8d8b348c1cca47bb --hard
-    git submodule update
     # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
     cmakeFlagsArray+=(
       "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}"

diff --git a/pkgs/to-sources/_sources/generated.json b/pkgs/to-sources/_sources/generated.json
@@ -598,25 +598,6 @@
         },
         "version": "v0.1.3"
     },
-    "suyu": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "suyu",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": true,
-            "fetchSubmodules": true,
-            "leaveDotGit": true,
-            "name": null,
-            "rev": "42f3dd309e8d89aef74344c5a66d0d1c7d7789a4",
-            "sha256": "sha256-B15AaXjfr+Ux/+f1Van3LIIFZ6AsM8vT4lHDgGbEWAE=",
-            "type": "git",
-            "url": "https://git.suyu.dev/suyu/suyu"
-        },
-        "version": "42f3dd309e8d89aef74344c5a66d0d1c7d7789a4"
-    },
     "taskwarrior-utils": {
         "cargoLocks": null,
         "date": "2024-04-03",

diff --git a/pkgs/to-sources/_sources/generated.nix b/pkgs/to-sources/_sources/generated.nix
@@ -353,18 +353,6 @@
       sha256 = "sha256-AyWtJ+EyTN2LEXLM5OSQB3ITzqLLRoirzkWnjwLHOIA=";
     };
   };
-  suyu = {
-    pname = "suyu";
-    version = "42f3dd309e8d89aef74344c5a66d0d1c7d7789a4";
-    src = fetchgit {
-      url = "https://git.suyu.dev/suyu/suyu";
-      rev = "42f3dd309e8d89aef74344c5a66d0d1c7d7789a4";
-      fetchSubmodules = true;
-      deepClone = true;
-      leaveDotGit = true;
-      sha256 = "sha256-B15AaXjfr+Ux/+f1Van3LIIFZ6AsM8vT4lHDgGbEWAE=";
-    };
-  };
   taskwarrior-utils = {
     pname = "taskwarrior-utils";
     version = "911ff711c665153b3ed9ba409671e674797eb481";

diff --git a/pkgs/to-sources/nvfetcher.toml b/pkgs/to-sources/nvfetcher.toml
@@ -129,14 +129,6 @@ fetch.github = "MetaCubeX/metacubexd"
 src.git = "https://github.com/z4yx/GoAuthing"
 fetch.github = "z4yx/GoAuthing"
 
-[suyu]
-# Its submodules has been redirected to a forked version
-src.manual = "42f3dd309e8d89aef74344c5a66d0d1c7d7789a4"
-git.fetchSubmodules = true
-git.leaveDotGit = true
-git.deepClone = true
-fetch.git = "https://git.suyu.dev/suyu/suyu"
-
 [compat-list]
 src.git = "https://github.com/flathub/org.yuzu_emu.yuzu"
 fetch.github = "flathub/org.yuzu_emu.yuzu"