From 0fce2ea3f28da352df891f56aacb352bac7ccdd7 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 18 Aug 2023 00:17:10 +0300 Subject: qt6Packages.kcoreaddons: drop This doesn't build. This also shouldn't exist. --- .../libraries/kde-frameworks/kcoreaddons.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'pkgs/development/libraries/kde-frameworks') diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 3e0eeec617b65..f790d802c0ca4 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -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"; -}) +} -- cgit 1.4.1