Skip to content

fix passing qt5 version to pythonInterpreters #98197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FRidh merged 1 commit into from
Sep 22, 2020
Merged

fix passing qt5 version to pythonInterpreters #98197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/python/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, lib }:
{ pkgs }:

with pkgs;

Expand Down
29 changes: 12 additions & 17 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10164,10 +10164,10 @@ in

pythonInterpreters = callPackage ./../development/interpreters/python {
# Overrides that apply to all Python interpreters
pkgs = pkgs // {
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
};
pkgs = pkgs.extend (final: _: {
qt5 = final.qt514;
libsForQt5 = final.libsForQt514;
});
};
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;

Expand Down Expand Up @@ -22840,19 +22840,14 @@ in
quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };

qutebrowser = let
libsForQt5 = libsForQt515;
qt5 = qt515;
python = python3.override {
packageOverrides = self: super: {
pkgs = pkgs // {
inherit libsForQt5 qt5;
};
};
self = python3;
};
in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
python3 = python;
};
pkgs_ = pkgs.extend(_: prev: {
pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
pkgs = oldAttrs.pkgs.extend(_: _: {
inherit (pkgs) qt5 libsForQt5;
});
});
});
in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };

rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

Expand Down