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

qutebrowser: use qt 5.15

Browse Source 
Follow-up to a4e50bb197f032ec447a13f56910ff035b32017f.
This commit is contained in:
Frederik Rietdijk 2020-09-16 21:00:04 +02:00
parent c88f3adb17
commit 2daf5702c6
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchzip, python3Packages { stdenv, lib, fetchurl, fetchzip, python3
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
, libxslt, gst_all_1 ? null , libxslt, gst_all_1 ? null
@ -10,6 +10,7 @@
assert withMediaPlayback -> gst_all_1 != null; assert withMediaPlayback -> gst_all_1 != null;
let let
python3Packages = python3.pkgs;
pdfjs = let pdfjs = let
version = "2.4.456"; version = "2.4.456";
in in

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

@ -22835,7 +22835,20 @@ in
quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; qutebrowser = let
libsForQt5 = qt515;
qt5 = qt515;
python = python3.override {
packageOverrides = self: super: {
pkgs = pkgs // {
inherit libsForQt5 qt5;
};
};
self = python3;
};
in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
python3 = python;
};
rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};