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

Commits on Oct 28, 2019

  1. pythonPackages.qscintilla-qt5: fix build

    @bene1618
    bene1618 authored and Jon committed Oct 28, 2019
    Copy the full SHA
    b27bdf4 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/qscintilla-qt5/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/qscintilla-qt5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,8 @@ buildPythonPackage {
lndir ${pyqt5} $out
rm -rf "$out/nix-support"
cd Python
substituteInPlace configure.py \
--replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}"
${python.executable} ./configure.py \
--pyqt=PyQt5 \
--destdir=$out/${python.sitePackages}/PyQt5 \
@@ -45,6 +47,5 @@ buildPythonPackage {
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ lsix ];
homepage = https://www.riverbankcomputing.com/software/qscintilla/;
broken = true;
};
}