MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

qt6Packages.kcoreaddons: drop

Browse source 
This doesn't build. This also shouldn't exist.
This commit is contained in:
K900 2023-08-18 00:17:10 +03:00
parent ec6b3ceeec
commit 0fce2ea3f2
2 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
View file

@ -1,24 +1,12 @@
{
mkDerivation, lib, stdenv,
mkDerivation,
extra-cmake-modules,
qtbase, qttools, shared-mime-info
}:
mkDerivation ({
mkDerivation {
pname = "kcoreaddons";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools shared-mime-info ];
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";
})
}

11
pkgs/top-level/qt6-packages.nix
View file

@ -13,24 +13,13 @@
(lib.makeScope pkgs.newScope ( self:
let
libsForQt6 = self;
callPackage = self.callPackage;
kdeFrameworks = let
mkFrameworks = import ../development/libraries/kde-frameworks;
attrs = {
libsForQt5 = libsForQt6;
inherit (pkgs) lib fetchurl;
};
in (lib.makeOverridable mkFrameworks attrs);
in
(qt6 // {
inherit stdenv;
# LIBRARIES
inherit (kdeFrameworks) kcoreaddons;
qt6ct = callPackage ../tools/misc/qt6ct { };
qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { };