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: 2df16bf647ad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b38b4572a40
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 3, 2019

  1. python2Packages.pyqt4: Fix build 

    (cherry picked from commit f14a48f)
    @jtojnar
    jtojnar committed Mar 3, 2019
    Copy the full SHA
    1861f58 View commit details

  2. python2Packages.pyqt4: partial clean up 

    (cherry picked from commit 6471655)
    @jtojnar
    jtojnar committed Mar 3, 2019
    Copy the full SHA
    5b38b45 View commit details
Showing with 19 additions and 19 deletions.
  1. +19 −18 pkgs/development/python-modules/pyqt/4.x.nix
  2. +0 −1 pkgs/top-level/python-packages.nix
37 changes: 19 additions & 18 deletions pkgs/development/python-modules/pyqt/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }:
{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }:

let
buildPythonPackage rec {
pname = "PyQt-x11-gpl";
version = "4.12";

inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage {
pname = pname;
name = pname + "-" + version;
version = version;
format = "other";

src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";
sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w";
};

configurePhase = ''
postPatch = ''
mkdir -p $out
lndir ${dbus-python} $out
rm -rf "$out/nix-support"
@@ -32,17 +26,24 @@ in buildPythonPackage {
--replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \
''}
configureFlagsArray=( \
--confirm-license --bindir $out/bin \
--destdir $out/${python.sitePackages} \
--plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip/PyQt4 \
--dbus=${dbus-python}/include/dbus-1.0 --verbose)
${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
chmod +x configure.py
sed -i '1i#!${python.interpreter}' configure.py
'';

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper qt4 lndir dbus ];
configureScript = "./configure.py";
dontAddPrefix = true;
configureFlags = [
"--confirm-license"
"--bindir=${placeholder "out"}/bin"
"--destdir=${placeholder "out"}/${python.sitePackages}"
"--plugin-destdir=${placeholder "out"}/lib/qt4/plugins"
"--sipdir=${placeholder "out"}/share/sip/PyQt4"
"--dbus=${stdenv.lib.getDev dbus-python}/include/dbus-1.0"
"--verbose"
];

nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ];
buildInputs = [ qt4 dbus ];

propagatedBuildInputs = [ sip ];

1 change: 0 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -681,7 +681,6 @@ in {
pyres = callPackage ../development/python-modules/pyres { };

pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
pythonPackages = self;
inherit (pkgs) pkgconfig;
};