Merge pull request #281901 from mfrischknecht/fix-frogmouth

frogmouth: use same xdg package as upstream
This commit is contained in:
a-n-n-a-l-e-e 2024-02-09 21:28:47 -08:00 committed by GitHub
commit 2394210484
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -15,13 +15,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-0fcCON/M9JklE7X9aRfzTkEFG4ckJqLoQlYCSrWHHGQ="; 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 = [ nativeBuildInputs = [
python3.pkgs.poetry-core python3.pkgs.poetry-core
python3.pkgs.pythonRelaxDepsHook python3.pkgs.pythonRelaxDepsHook
@ -31,13 +24,12 @@ python3.pkgs.buildPythonApplication rec {
httpx httpx
textual textual
typing-extensions typing-extensions
xdg-base-dirs xdg
]; ];
pythonRelaxDeps = [ pythonRelaxDeps = [
"httpx" "httpx"
"textual" "textual"
"xdg-base-dirs"
]; ];
pythonImportsCheck = [ "frogmouth" ]; pythonImportsCheck = [ "frogmouth" ];