qscintilla, python3Packages.qscintilla-qt5: syntax
- Cleanup top-level package calls to remove unnecessary darwin logic and inherit statements - Remove unnecessary let blocks in qscintilla and qscintilla-qt4 - Remove mention of withQt5
This commit is contained in:
parent
24522dcd0f
commit
8dfa516824
|
@ -1,13 +1,10 @@
|
||||||
{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
|
{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
pname = "qscintilla-qt4";
|
pname = "qscintilla-qt4";
|
||||||
version = "2.11.6";
|
version = "2.11.6";
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
inherit pname version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
|
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
|
||||||
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
|
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
{ stdenv, lib, fetchurl, unzip
|
{ stdenv, lib, fetchurl, unzip
|
||||||
, withQt5 ? true, qtbase, qtmacextras ? null
|
, qtbase, qtmacextras
|
||||||
, qmake
|
, qmake
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
pname = "qscintilla-qt5";
|
pname = "qscintilla-qt5";
|
||||||
version = "2.13.1";
|
version = "2.13.1";
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
inherit pname version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
|
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
|
||||||
sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
|
sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
|
||||||
|
|
|
@ -8290,7 +8290,6 @@ in {
|
||||||
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { };
|
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { };
|
||||||
|
|
||||||
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
|
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
|
||||||
inherit (pkgs.qt5) qtbase;
|
|
||||||
pythonPackages = self;
|
pythonPackages = self;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -191,13 +191,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
||||||
|
|
||||||
qoauth = callPackage ../development/libraries/qoauth { };
|
qoauth = callPackage ../development/libraries/qoauth { };
|
||||||
|
|
||||||
qscintilla = if stdenv.isDarwin then
|
qscintilla = callPackage ../development/libraries/qscintilla { };
|
||||||
callPackage ../development/libraries/qscintilla {
|
|
||||||
inherit (qt5) qmake qtbase qtmacextras;
|
|
||||||
} else
|
|
||||||
callPackage ../development/libraries/qscintilla {
|
|
||||||
inherit (qt5) qmake qtbase;
|
|
||||||
};
|
|
||||||
|
|
||||||
qt5ct = callPackage ../tools/misc/qt5ct { };
|
qt5ct = callPackage ../tools/misc/qt5ct { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue