Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2bd77259133
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48d832dc3df8
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Aug 4, 2019

  1. qutebrowser: add wrapQtAppsHook 

    This commit fixes the error:

Could not find the Qt platform plugin "xcb" in ""

Closes #65895
    @emmanuelrosa
    Emmanuel Rosa authored and emmanuelrosa committed Aug 4, 2019
    Copy the full SHA
    f9ed3a6 View commit details

  2. qutebrowser: 1.6.3 -> 1.7.0 

    pdfjs: 1.10.100 -> 2.1.266
    @magnetophon @emmanuelrosa
    magnetophon authored and emmanuelrosa committed Aug 4, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    fa7716c View commit details

  3. Merge pull request #65895 from emmanuelrosa/qutebrowser-qt-fix 

    qutebrowser: add wrapQtAppsHook
    @worldofpeace
    worldofpeace authored Aug 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48d832d View commit details
Showing with 18 additions and 9 deletions.
  1. +18 −9 pkgs/applications/networking/browsers/qutebrowser/default.nix
27 changes: 18 additions & 9 deletions pkgs/applications/networking/browsers/qutebrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchzip, python3Packages
, makeWrapper, wrapGAppsHook, qtbase, glib-networking
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
, libxslt, gst_all_1 ? null
, withPdfReader ? true
@@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null;

let
pdfjs = let
version = "1.10.100";
version = "2.1.266";
in
fetchzip rec {
name = "pdfjs-${version}";
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby";
stripRoot = false;
};

in python3Packages.buildPythonApplication rec {
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "1.6.3";
version = "1.7.0";

# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy";
sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i";
};

# Needs tox
@@ -41,7 +41,7 @@ in python3Packages.buildPythonApplication rec {
]);

nativeBuildInputs = [
makeWrapper wrapGAppsHook asciidoc
wrapQtAppsHook wrapGAppsHook asciidoc
docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];

@@ -57,6 +57,9 @@ in python3Packages.buildPythonApplication rec {
./fix-restart.patch
];

dontWrapGApps = true;
dontWrapQtApps = true;

postPatch = ''
substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
@@ -71,8 +74,8 @@ in python3Packages.buildPythonApplication rec {

postInstall = ''
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
install -Dm644 misc/qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
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
@@ -95,6 +98,12 @@ in python3Packages.buildPythonApplication rec {
done
'';

postFixup = ''
wrapProgram $out/bin/qutebrowser \
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}"
'';

meta = with stdenv.lib; {
homepage = https://github.com/The-Compiler/qutebrowser;
description = "Keyboard-focused browser with a minimal GUI";