about summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authora-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com>2024-02-09 21:28:47 -0800
committerGitHub <noreply@github.com>2024-02-09 21:28:47 -0800
commit23942104840f84d561c56f419690950edade877e (patch)
treed023100d367a2b34840a5596d1573fd41e233b54 /pkgs/tools/text
parent47423f1598d682c26043781cdde3fb6e1d36b63c (diff)
parent386faef6e6d905abcbf9d4a85c92f60bbf5a61bb (diff)
Merge pull request #281901 from mfrischknecht/fix-frogmouth
frogmouth: use same xdg package as upstream
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/frogmouth/default.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/tools/text/frogmouth/default.nix
index 9ec9134c661e2..68d63dc7aa5fe 100644
--- a/pkgs/tools/text/frogmouth/default.nix
+++ b/pkgs/tools/text/frogmouth/default.nix
@@ -15,13 +15,6 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-0fcCON/M9JklE7X9aRfzTkEFG4ckJqLoQlYCSrWHHGQ=";
   };
 
-  # Per <https://github.com/srstevenson/xdg-base-dirs/tree/6.0.0#xdg-base-dirs>, the package is
-  # renamed from `xdg` to `xdg_base_dirs`, but upstream isn't amenable to performing that rename.
-  # See <https://github.com/Textualize/frogmouth/pull/59>. So this is a minimal fix.
-  postUnpack = ''
-    sed -i -e "s,from xdg import,from xdg_base_dirs import," $sourceRoot/frogmouth/data/{config,data_directory}.py
-  '';
-
   nativeBuildInputs = [
     python3.pkgs.poetry-core
     python3.pkgs.pythonRelaxDepsHook
@@ -31,13 +24,12 @@ python3.pkgs.buildPythonApplication rec {
     httpx
     textual
     typing-extensions
-    xdg-base-dirs
+    xdg
   ];
 
   pythonRelaxDeps = [
     "httpx"
     "textual"
-    "xdg-base-dirs"
   ];
 
   pythonImportsCheck = [ "frogmouth" ];