swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

qscintilla: migrate to libsForQt5.qscintilla

Browse source
This commit is contained in:
Will Cohen 2021-12-15 11:22:46 -05:00
parent 9d8903bab6
commit 24522dcd0f
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/top-level/all-packages.nix
View file

@ -9092,13 +9092,7 @@ with pkgs;
qprint = callPackage ../tools/text/qprint { };
qscintilla = if stdenv.isDarwin then
callPackage ../development/libraries/qscintilla {
inherit (qt5) qmake qtbase qtmacextras;
} else
callPackage ../development/libraries/qscintilla {
inherit (qt5) qmake qtbase;
};
qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { };
qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
@ -19500,17 +19494,17 @@ with pkgs;
});
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
inherit lib pkgs;
inherit lib pkgs stdenv;
qt5 = qt512;
});
libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix {
inherit lib pkgs;
inherit lib pkgs stdenv;
qt5 = qt514;
});
libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix {
inherit lib pkgs;
inherit lib pkgs stdenv;
qt5 = qt515;
});

9
pkgs/top-level/qt5-packages.nix
View file

@ -9,6 +9,7 @@
{ lib
, pkgs
, qt5
, stdenv
}:
(lib.makeScope pkgs.newScope ( self:
@ -190,8 +191,12 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
qoauth = callPackage ../development/libraries/qoauth { };
qscintilla = callPackage ../development/libraries/qscintilla {
withQt5 = true;
qscintilla = if stdenv.isDarwin then
callPackage ../development/libraries/qscintilla {
inherit (qt5) qmake qtbase qtmacextras;
} else
callPackage ../development/libraries/qscintilla {
inherit (qt5) qmake qtbase;
};
qt5ct = callPackage ../tools/misc/qt5ct { };