diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix index c74a9b9d190..7cefdec97ca 100644 --- a/pkgs/development/libraries/qscintilla-qt4/default.nix +++ b/pkgs/development/libraries/qscintilla-qt4/default.nix @@ -1,13 +1,10 @@ { stdenv, lib, fetchurl, unzip, qt4, qmake4Hook }: -let +stdenv.mkDerivation rec { pname = "qscintilla-qt4"; version = "2.11.6"; -in stdenv.mkDerivation rec { - inherit pname version; - src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index bebe637be9b..332d61c1c4a 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,16 +1,13 @@ { stdenv, lib, fetchurl, unzip -, withQt5 ? true, qtbase, qtmacextras ? null +, qtbase, qtmacextras , qmake , fixDarwinDylibNames }: -let +stdenv.mkDerivation rec { pname = "qscintilla-qt5"; version = "2.13.1"; -in stdenv.mkDerivation rec { - inherit pname version; - src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"; sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo="; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56f6dfe420c..0fc093f20c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8290,7 +8290,6 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { - inherit (pkgs.qt5) qtbase; pythonPackages = self; }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 5579461a712..814d58dcd21 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -191,13 +191,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qoauth = callPackage ../development/libraries/qoauth { }; - qscintilla = if stdenv.isDarwin then - callPackage ../development/libraries/qscintilla { - inherit (qt5) qmake qtbase qtmacextras; - } else - callPackage ../development/libraries/qscintilla { - inherit (qt5) qmake qtbase; - }; + qscintilla = callPackage ../development/libraries/qscintilla { }; qt5ct = callPackage ../tools/misc/qt5ct { };