cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
qutebrowser: use upstream make install
This commit is contained in:
Timothy DeHerrera 2022-10-17 16:11:24 -06:00 committed by GitHub
commit 965c7a6a58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/applications/networking/browsers/qutebrowser/default.nix
View file

@ -100,9 +100,7 @@ buildPythonApplication {
dontWrapGApps = true;
dontWrapQtApps = true;
preConfigure = ''
a2x -f manpage doc/qutebrowser.1.asciidoc
'' + lib.optionalString isQt6 ''
preConfigure = lib.optionalString isQt6 ''
python scripts/asciidoc2html.py
'';
@ -114,25 +112,20 @@ buildPythonApplication {
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
'';
installPhase = ''
runHook preInstall
make -f misc/Makefile \
PYTHON=${python3}/bin/python3 \
PREFIX=. \
DESTDIR="$out" \
DATAROOTDIR=/share \
install
runHook postInstall
'';
postInstall = ''
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \
"$out/share/applications/org.qutebrowser.qutebrowser.desktop"
# Install icons
for i in 16 24 32 48 64 128 256 512; do
install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \
"$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png"
done
install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
# Install scripts
sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh
${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"}
install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f)
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
# Patch python scripts
buildPythonPath "$out $propagatedBuildInputs"
scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/)
@ -156,10 +149,10 @@ buildPythonApplication {
'';
meta = with lib; {
homepage = "https://github.com/The-Compiler/qutebrowser";
homepage = "https://github.com/qutebrowser/qutebrowser";
description = "Keyboard-focused browser with a minimal GUI";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ];
platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms;
maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ];
};
}