From cf2603f144b86201635867c7e19f41fd965b382c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 12 Sep 2018 02:41:03 +0200 Subject: qutebrowser: patch all python scripts --- .../networking/browsers/qutebrowser/default.nix | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/networking/browsers/qutebrowser') diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b4932ee0f1b9..b71eea791550 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -55,6 +55,9 @@ in python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs + # scripts and userscripts libs + tldextract beautifulsoup4 + pyreadability pykeepass stem ]; postPatch = '' @@ -81,15 +84,15 @@ in python3Packages.buildPythonApplication rec { "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts - sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh - install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh + sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh + install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* - # Install and patch python scripts + # Patch python scripts buildPythonPath "$out $propagatedBuildInputs" - for i in importer dictcli keytester utils; do - install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py - patchPythonScript "$out/share/qutebrowser/scripts/$i.py" + scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) + for i in $scripts; do + patchPythonScript "$i" done ''; @@ -97,10 +100,10 @@ in python3Packages.buildPythonApplication rec { wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit" ''; - meta = { - homepage = https://github.com/The-Compiler/qutebrowser; + meta = with stdenv.lib; { + homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jagajaga rnhmjoj ]; }; } -- cgit 1.4.1