diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-09-17 20:26:56 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2022-09-17 20:51:50 +0800 |
| commit | 71c0edefedada04459a807043df9c66e80df7c1d (patch) | |
| tree | 7de81e7fcd300d8ba0a2b645a2f9ad49ad5f3f8b /pkgs/development/libraries/kde-frameworks | |
| parent | 8c43540e6ff4cfb2f75b6945595832fe39d126b9 (diff) | |
qt6Packages.kcoreaddons: init
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index e9a333c98a199..31bce026daa0d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -40,7 +40,7 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ stdenv, mkDerivation ? stdenv.mkDerivation }: mkDerivation) {}; packages = self: with self; # SUPPORT diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index f790d802c0ca4..fbd6710994659 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,12 +1,21 @@ { - mkDerivation, + mkDerivation, lib, 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" + ''; +}) |