Unverified Commit 493ee155 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #308652 from bwkam/fix-matrix_upload-weechat 

weechat-matrix: substitute matrix_upload
parents dcdd47e3 06cc2f26

pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -76,11 +76,11 @@ in buildPythonPackage { 
    cp contrib/matrix_decrypt.py $out/bin/matrix_decrypt

    cp contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper

    substituteInPlace $out/bin/matrix_upload \

      --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'

      --replace-fail '/usr/bin/env -S python3' '${scriptPython}/bin/python'

    substituteInPlace $out/bin/matrix_sso_helper \

      --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'

      --replace-fail '/usr/bin/env -S python3' '${scriptPython}/bin/python'

    substituteInPlace $out/bin/matrix_decrypt \

      --replace '/usr/bin/env python3' '${scriptPython}/bin/python'

      --replace-fail '/usr/bin/env python3' '${scriptPython}/bin/python'



    mkdir -p $out/${python.sitePackages}

    cp -r matrix $out/${python.sitePackages}/matrix
@@ -90,7 +90,8 @@ in buildPythonPackage { 
  postFixup = ''

    addToSearchPath program_PYTHONPATH $out/${python.sitePackages}

    patchPythonScript $out/share/matrix.py

    substituteInPlace $out/${python.sitePackages}/matrix/server.py --replace \"matrix_sso_helper\" \"$out/bin/matrix_sso_helper\"

    substituteInPlace $out/${python.sitePackages}/matrix/server.py --replace-fail \"matrix_sso_helper\" \"$out/bin/matrix_sso_helper\"

    substituteInPlace $out/${python.sitePackages}/matrix/uploads.py --replace-fail \"matrix_upload\" \"$out/bin/matrix_upload\"

  '';



  meta = with lib; {