From de816bea61ebf8440e1541e77c1f543c510fd6b6 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:55:15 +0800
Subject: [PATCH 1/7] dart.xdg_directories: init

---
 .../dart/package-source-builders/default.nix  |  1 +
 .../xdg_directories/default.nix               | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix

diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index 2358156842c9..e462e932cca6 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -16,4 +16,5 @@
   sqlite3_flutter_libs = callPackage ./sqlite3_flutter_libs { };
   system_tray = callPackage ./system-tray { };
   super_native_extensions = callPackage ./super_native_extensions { };
+  xdg_directories = callPackage ./xdg_directories { };
 }
diff --git a/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix b/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix
new file mode 100644
index 000000000000..e439ba4c0648
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/xdg_directories/default.nix
@@ -0,0 +1,25 @@
+{
+  stdenv,
+  xdg-user-dirs,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation rec {
+  pname = "xdg_directories";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = ''
+    substituteInPlace ./lib/xdg_directories.dart \
+      --replace-fail "'xdg-user-dir'," "'${xdg-user-dirs}/bin/xdg-user-dir',"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r . $out
+
+    runHook postInstall
+  '';
+}

From 4b01903967ca7371b06af27ce2f0444f10d5b28c Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:57:59 +0800
Subject: [PATCH 2/7] ente-auth: remove useless xdg-user-dirs

---
 pkgs/by-name/en/ente-auth/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index f0c21d7aad87..e80e47f5611d 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -9,7 +9,6 @@
   copyDesktopItems,
   imagemagick,
   makeWrapper,
-  xdg-user-dirs,
 }:
 let
   # fetch simple-icons directly to avoid cloning with submodules,
@@ -89,9 +88,6 @@ flutter324.buildFlutterApplication rec {
     done
 
     install -Dm444 linux/packaging/ente_auth.appdata.xml -t $out/share/metainfo
-
-    wrapProgram $out/bin/ente_auth \
-      --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
   '';
 
   passthru.updateScript = ./update.sh;

From 7789a66309fce4d92c6af1f730f7c3fa4e972f22 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:59:05 +0800
Subject: [PATCH 3/7] finamp: remove useless xdg-user-dirs

---
 pkgs/by-name/fi/finamp/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index e3a58bc3c36f..80567e7e2f86 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -1,7 +1,6 @@
 { lib
 , flutter327
 , mpv-unwrapped
-, xdg-user-dirs
 , patchelf
 , fetchFromGitHub
 , copyDesktopItems
@@ -40,10 +39,6 @@ flutter327.buildFlutterApplication {
     install -Dm644 $src/assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg
   '';
 
-  extraWrapProgramArgs = ''
-    --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
-  '';
-
   desktopItems = [(makeDesktopItem {
     name = "Finamp";
     desktopName = "Finamp";

From a239f788801f5932a3326c5780130386344ab809 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 19:59:44 +0800
Subject: [PATCH 4/7] kazumi: remove useless xdg-user-dirs

---
 pkgs/by-name/ka/kazumi/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 49c928f50118..7509708325dc 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -12,7 +12,6 @@
   mimalloc,
   mpv,
   mpv-unwrapped,
-  xdg-user-dirs,
 }:
 flutter324.buildFlutterApplication rec {
   pname = "kazumi";
@@ -110,10 +109,6 @@ flutter324.buildFlutterApplication rec {
     install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
   '';
 
-  extraWrapProgramArgs = ''
-    --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
-  '';
-
   meta = {
     description = "Watch Animes online with danmaku support";
     homepage = "https://github.com/Predidit/Kazumi";

From 82108e2d6be88465643bf3db968b0d4381aa758a Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:00:33 +0800
Subject: [PATCH 5/7] mangayomi: remove useless xdg-user-dirs

---
 pkgs/by-name/ma/mangayomi/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index 3491375298e3..7682422e031c 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -35,7 +35,6 @@
   libvdpau,
   rustPlatform,
   stdenv,
-  xdg-user-dirs,
   zenity,
   copyDesktopItems,
   makeDesktopItem,
@@ -161,7 +160,6 @@ flutter324.buildFlutterApplication {
     --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
     --prefix PATH : "${
       lib.makeBinPath [
-        xdg-user-dirs
         zenity
       ]
     }"

From 97fcdafc591e5b91c1cf61cba4cf7291fafb92c6 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:01:23 +0800
Subject: [PATCH 6/7] oneanime: remove useless xdg-user-dirs

---
 pkgs/by-name/on/oneanime/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix
index 9e116aab3d74..5abde1124c9e 100644
--- a/pkgs/by-name/on/oneanime/package.nix
+++ b/pkgs/by-name/on/oneanime/package.nix
@@ -12,7 +12,6 @@
   libpulseaudio,
   libdrm,
   mesa,
-  xdg-user-dirs,
   libva,
   libva1,
   libvdpau,
@@ -104,10 +103,6 @@ flutter324.buildFlutterApplication rec {
     ln -s ${lib.getLib libvdpau}/lib/libvdpau.so.1  $out/app/${pname}/lib/libvdpau.so.1
   '';
 
-  extraWrapProgramArgs = ''
-    --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
-  '';
-
   meta = {
     description = "Anime1 third-party client with bullet screen";
     homepage = "https://github.com/Predidit/oneAnime";

From 27d764403273abde91d99864b9eccee7cef03cc8 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:02:05 +0800
Subject: [PATCH 7/7] pilipalax: remove useless xdg-user-dirs

---
 pkgs/by-name/pi/pilipalax/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix
index 726d8afd7ada..f03726301f2a 100644
--- a/pkgs/by-name/pi/pilipalax/package.nix
+++ b/pkgs/by-name/pi/pilipalax/package.nix
@@ -36,7 +36,6 @@
   makeDesktopItem,
   wrapGAppsHook3,
   copyDesktopItems,
-  xdg-user-dirs,
 }:
 flutter324.buildFlutterApplication rec {
   pname = "pilipalax";
@@ -111,8 +110,7 @@ flutter324.buildFlutterApplication rec {
   '';
 
   extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
-    --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
+    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
   '';
 
   meta = {