[build] Include secretstorage in Linux builds

Authored by: bashonly

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c5bb76d8b22a944ffbb2fdbe7a8434bd87f38d9b..3e9811f0f09f5000cc974c00929b8e41dd756f05 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -122,14 +122,15 @@ jobs:
         run: |
           sudo apt -y install zip pandoc man sed
           reqs=$(mktemp)
-          cat > $reqs << EOF
+          cat > "$reqs" << EOF
           python=3.10.*
           pyinstaller
           cffi
           brotli-python
+          secretstorage
           EOF
-          sed '/^brotli.*/d' requirements.txt >> $reqs
-          mamba create -n build --file $reqs
+          sed -E '/^(brotli|secretstorage).*/d' requirements.txt >> "$reqs"
+          mamba create -n build --file "$reqs"
 
       - name: Prepare
         run: |

diff --git a/requirements.txt b/requirements.txt
index 112c30aeb7ea13cc2d6afdd5ad18470078626c4d..4d231072531561faa0f06cc81427c36024a93adc 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
 mutagen
 pycryptodomex
 websockets
-brotli; platform_python_implementation=='CPython'
-brotlicffi; platform_python_implementation!='CPython'
+brotli; implementation_name=='cpython'
+brotlicffi; implementation_name!='cpython'
 certifi
 requests>=2.31.0,<3
-urllib3>=1.26.17,<3
\ No newline at end of file
+urllib3>=1.26.17,<3
+secretstorage; sys_platform=='linux' and (implementation_name!='pypy' or implementation_version>='7.3.10')

diff --git a/yt_dlp/__pyinstaller/hook-yt_dlp.py b/yt_dlp/__pyinstaller/hook-yt_dlp.py
index c7f2c0ceb713aac28d8b3a84109634a330f562d6..20f037d32fdc31ba096020587fab0fb36997bf44 100644 (file)
--- a/yt_dlp/__pyinstaller/hook-yt_dlp.py
+++ b/yt_dlp/__pyinstaller/hook-yt_dlp.py
@@ -25,7 +25,7 @@ def get_hidden_imports():
     for module in ('websockets', 'requests', 'urllib3'):
         yield from collect_submodules(module)
     # These are auto-detected, but explicitly add them just in case
-    yield from ('mutagen', 'brotli', 'certifi')
+    yield from ('mutagen', 'brotli', 'certifi', 'secretstorage')
 
 
 hiddenimports = list(get_hidden_imports())