qt6Packages.kcoreaddons: drop
This doesn't build. This also shouldn't exist.
This commit is contained in:
parent
ec6b3ceeec
commit
0fce2ea3f2
@ -1,24 +1,12 @@
|
|||||||
{
|
{
|
||||||
mkDerivation, lib, stdenv,
|
mkDerivation,
|
||||||
extra-cmake-modules,
|
extra-cmake-modules,
|
||||||
qtbase, qttools, shared-mime-info
|
qtbase, qttools, shared-mime-info
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation ({
|
mkDerivation {
|
||||||
pname = "kcoreaddons";
|
pname = "kcoreaddons";
|
||||||
nativeBuildInputs = [ extra-cmake-modules ];
|
nativeBuildInputs = [ extra-cmake-modules ];
|
||||||
buildInputs = [ qttools shared-mime-info ];
|
buildInputs = [ qttools shared-mime-info ];
|
||||||
propagatedBuildInputs = [ qtbase ];
|
propagatedBuildInputs = [ qtbase ];
|
||||||
} // lib.optionalAttrs (lib.versionAtLeast qtbase.version "6") {
|
}
|
||||||
dontWrapQtApps = true;
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DBUILD_WITH_QT6=ON"
|
|
||||||
"-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT"
|
|
||||||
];
|
|
||||||
postInstall = ''
|
|
||||||
moveToOutput "mkspecs" "$dev"
|
|
||||||
'';
|
|
||||||
} // lib.optionalAttrs stdenv.isDarwin {
|
|
||||||
# https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/327
|
|
||||||
env.NIX_CFLAGS_COMPILE = "-DSOCK_CLOEXEC=0";
|
|
||||||
})
|
|
||||||
|
@ -13,24 +13,13 @@
|
|||||||
(lib.makeScope pkgs.newScope ( self:
|
(lib.makeScope pkgs.newScope ( self:
|
||||||
|
|
||||||
let
|
let
|
||||||
libsForQt6 = self;
|
|
||||||
callPackage = self.callPackage;
|
callPackage = self.callPackage;
|
||||||
kdeFrameworks = let
|
|
||||||
mkFrameworks = import ../development/libraries/kde-frameworks;
|
|
||||||
attrs = {
|
|
||||||
libsForQt5 = libsForQt6;
|
|
||||||
inherit (pkgs) lib fetchurl;
|
|
||||||
};
|
|
||||||
in (lib.makeOverridable mkFrameworks attrs);
|
|
||||||
in
|
in
|
||||||
|
|
||||||
(qt6 // {
|
(qt6 // {
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
|
|
||||||
# LIBRARIES
|
# LIBRARIES
|
||||||
|
|
||||||
inherit (kdeFrameworks) kcoreaddons;
|
|
||||||
|
|
||||||
qt6ct = callPackage ../tools/misc/qt6ct { };
|
qt6ct = callPackage ../tools/misc/qt6ct { };
|
||||||
|
|
||||||
qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { };
|
qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { };
|
||||||
|
Loading…
Reference in New Issue
Block a user