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: 9b5669b5a694
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1b4c6c4eb92
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 21, 2018

  1. pyqt5: propagate Qt dependencies 

    This is so that Qt user environment packages are also propagated. Fixes
Electrum environment installations when no other Qt applications are installed.

Added `dev` output so that closure size won't explode.
    @abbradar
    abbradar committed Mar 21, 2018
    Copy the full SHA
    b1b4c6c View commit details
Showing with 8 additions and 5 deletions.
  1. +8 −5 pkgs/development/python-modules/pyqt/5.x.nix
13 changes: 8 additions & 5 deletions pkgs/development/python-modules/pyqt/5.x.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ let
version = "5.10";

inherit (pythonPackages) buildPythonPackage python dbus-python sip;

in buildPythonPackage {
pname = pname;
version = version;
@@ -27,13 +28,15 @@ in buildPythonPackage {
sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl";
};

nativeBuildInputs = [ pkgconfig qmake ];
outputs = [ "out" "dev" ];

buildInputs = [
lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
nativeBuildInputs = [ pkgconfig qmake lndir ];

propagatedBuildInputs = [ sip ];
buildInputs = [ dbus_libs ];

propagatedBuildInputs = [
sip qtbase qtsvg qtwebkit qtwebengine
] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;

configurePhase = ''
runHook preConfigure