cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qt6Packages.kcoreaddons: init

Browse source
This commit is contained in:
Nick Cao 2022-09-17 20:26:56 +08:00
parent 8c43540e6f
commit 71c0edefed
No known key found for this signature in database
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/kde-frameworks/default.nix
View file

@ -40,7 +40,7 @@ let
mirror = "mirror://kde"; mirror = "mirror://kde";
}; };
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; mkDerivation = libsForQt5.callPackage ({ stdenv, mkDerivation ? stdenv.mkDerivation }: mkDerivation) {};
packages = self: with self; packages = self: with self;
# SUPPORT # SUPPORT

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

@ -1,12 +1,21 @@
{ {
mkDerivation, mkDerivation, lib,
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"
'';
})

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

@ -14,11 +14,20 @@
let let
libsForQt6 = self; 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 // {
# LIBRARIES # LIBRARIES
inherit (kdeFrameworks) kcoreaddons;
quazip = callPackage ../development/libraries/quazip { }; quazip = callPackage ../development/libraries/quazip { };
poppler = callPackage ../development/libraries/poppler { poppler = callPackage ../development/libraries/poppler {