public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qutebrowser: add shared files and cleanup

This commit is contained in:
Nikolay Amiantov 2016-08-15 11:36:12 +03:00
parent 397a17aef9
commit 9b4a7984a4
2 changed files with 35 additions and 10 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

@ -1,6 +1,7 @@
{ stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5 { stdenv, fetchurl, buildPythonApplication, makeQtWrapper, wrapGAppsHook
, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , qtmultimedia, pyqt5, jinja2, pygments, pyyaml, pypeg2, glib_networking
, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }: , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav }:
let version = "0.8.2"; in let version = "0.8.2"; in
@ -16,18 +17,42 @@ buildPythonApplication rec {
# Needs tox # Needs tox
doCheck = false; doCheck = false;
buildInputs = [ wrapGAppsHook makeQtWrapper buildInputs = [
qtmultimedia qtmultimedia
gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
glib_networking ]; glib_networking
];
nativeBuildInputs = [
makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];
propagatedBuildInputs = [ propagatedBuildInputs = [
python pyyaml pyqt5 jinja2 pygments pypeg2 pyyaml pyqt5 jinja2 pygments pypeg2
]; ];
postPatch = ''
sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py
'';
postBuild = ''
a2x -f manpage doc/qutebrowser.1.asciidoc
'';
postInstall = '' postInstall = ''
mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
install -Dm644 qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
for i in 16 24 32 48 64 128 256 512; do
install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \
"$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png"
done
install -Dm644 icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
''; '';
meta = { meta = {

6
pkgs/top-level/all-packages.nix
View File

@ -14408,9 +14408,9 @@ in
gst_plugins_bad = null; gst_plugins_bad = null;
}; };
qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser { qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {
inherit (python34Packages) buildPythonApplication python pyqt5 jinja2 pygments pyyaml pypeg2; inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2;
inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
}; };
rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};