Merge pull request #195744 from nrdxp/qutebrowser-upstream-install

qutebrowser: use upstream make install

authored by

Timothy DeHerrera and committed by
GitHub
965c7a6a 41c16756

+14 -21
+14 -21
pkgs/applications/networking/browsers/qutebrowser/default.nix
··· 100 100 dontWrapGApps = true; 101 101 dontWrapQtApps = true; 102 102 103 - preConfigure = '' 104 - a2x -f manpage doc/qutebrowser.1.asciidoc 105 - '' + lib.optionalString isQt6 '' 103 + preConfigure = lib.optionalString isQt6 '' 106 104 python scripts/asciidoc2html.py 107 105 ''; 108 106 ··· 114 112 sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py 115 113 ''; 116 114 117 - postInstall = '' 118 - install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" 119 - install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ 120 - "$out/share/applications/org.qutebrowser.qutebrowser.desktop" 115 + installPhase = '' 116 + runHook preInstall 121 117 122 - # Install icons 123 - for i in 16 24 32 48 64 128 256 512; do 124 - install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \ 125 - "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" 126 - done 127 - install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \ 128 - "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" 118 + make -f misc/Makefile \ 119 + PYTHON=${python3}/bin/python3 \ 120 + PREFIX=. \ 121 + DESTDIR="$out" \ 122 + DATAROOTDIR=/share \ 123 + install 129 124 130 - # Install scripts 131 - sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh 132 - ${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"} 133 - install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) 134 - install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* 125 + runHook postInstall 126 + ''; 135 127 128 + postInstall = '' 136 129 # Patch python scripts 137 130 buildPythonPath "$out $propagatedBuildInputs" 138 131 scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) ··· 156 149 ''; 157 150 158 151 meta = with lib; { 159 - homepage = "https://github.com/The-Compiler/qutebrowser"; 152 + homepage = "https://github.com/qutebrowser/qutebrowser"; 160 153 description = "Keyboard-focused browser with a minimal GUI"; 161 154 license = licenses.gpl3Plus; 162 - maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; 163 155 platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms; 156 + maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ]; 164 157 }; 165 158 }