-
-
Save samueldr/54adf4d07813c59346d6981545e9fc00 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix | |
index 2aeae1f1890..6e0c33a7251 100644 | |
--- a/pkgs/applications/audio/picard/default.nix | |
+++ b/pkgs/applications/audio/picard/default.nix | |
@@ -1,4 +1,4 @@ | |
-{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 | |
+{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint | |
, enablePlayback ? true | |
, gst_all_1 | |
}: | |
@@ -10,6 +10,7 @@ let | |
else | |
pythonPackages.pyqt5 | |
; | |
+ inherit (pyqt5) qt5; | |
in pythonPackages.buildPythonApplication rec { | |
pname = "picard"; | |
version = "2.4.2"; | |
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix | |
index ece9ad5b4a3..1ba026c9bb6 100644 | |
--- a/pkgs/development/python-modules/pyqt/5.x.nix | |
+++ b/pkgs/development/python-modules/pyqt/5.x.nix | |
@@ -1,6 +1,7 @@ | |
{ lib, pythonPackages, pkgconfig | |
, dbus | |
, qmake, lndir | |
+, qt5 | |
, qtbase | |
, qtsvg | |
, qtdeclarative | |
@@ -139,6 +140,10 @@ in buildPythonPackage rec { | |
enableParallelBuilding = true; | |
+ passthru = { | |
+ inherit qt5; | |
+ }; | |
+ | |
meta = with lib; { | |
description = "Python bindings for Qt5"; | |
homepage = "http://www.riverbankcomputing.co.uk"; | |
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix | |
index b8135c08374..4594246025c 100644 | |
--- a/pkgs/top-level/python-packages.nix | |
+++ b/pkgs/top-level/python-packages.nix | |
@@ -5201,7 +5201,7 @@ in { | |
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; | |
- pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; | |
+ pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; inherit qt5; }; | |
pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment