colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtstyleplugin-kvantum: 1.0.10 -> 1.1.0 (#297048)

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2024-03-25 12:09:30 +01:00 committed by GitHub
parent 8621265c46
commit 411f1f7b4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, cmake
, qmake , qmake
, qtbase , qtbase
, qtsvg , qtsvg
@ -14,23 +15,24 @@
, wrapQtAppsHook , wrapQtAppsHook
, gitUpdater , gitUpdater
, qt5Kvantum ? null , qt6Kvantum ? null
}: }:
let let
isQt6 = lib.versionAtLeast qtbase.version "6"; isQt5 = lib.versionOlder qtbase.version "6";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}";
version = "1.0.10"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tsujan"; owner = "tsujan";
repo = "Kvantum"; repo = "Kvantum";
rev = "V${version}"; rev = "V${finalAttrs.version}";
sha256 = "48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro="; hash = "sha256-i+QjVPSzWNPVQmQkB+u/3Wrvqqoz5OIjRdyZKXzxZh4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake
qmake qmake
qttools qttools
wrapQtAppsHook wrapQtAppsHook
@ -41,10 +43,11 @@ stdenv.mkDerivation rec {
qtsvg qtsvg
libX11 libX11
libXext libXext
] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] kwindowsystem
++ lib.optional isQt6 qtwayland; ] ++ lib.optionals isQt5 [ qtx11extras ]
++ lib.optionals (!isQt5) [ qtwayland ];
sourceRoot = "${src.name}/Kvantum"; sourceRoot = "${finalAttrs.src.name}/Kvantum";
patches = [ patches = [
(fetchpatch { (fetchpatch {
@ -56,15 +59,19 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
# Fix plugin dir substituteInPlace style/CMakeLists.txt \
substituteInPlace style/style.pro \ --replace-fail '"''${_Qt6_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/" \
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" --replace-fail '"''${_Qt5_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/"
''; '';
postInstall = lib.optionalString isQt6 '' cmakeFlags = [
# make default Kvantum themes available for Qt 6 apps (lib.cmakeBool "ENABLE_QT5" isQt5)
];
postInstall = lib.optionalString isQt5 ''
# make default Kvantum themes available for Qt 5 apps
mkdir -p "$out/share" mkdir -p "$out/share"
ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" ln -s "${qt6Kvantum}/share/Kvantum" "$out/share/Kvantum"
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
@ -78,4 +85,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ romildo Scrumplex ]; maintainers = with maintainers; [ romildo Scrumplex ];
}; };
} })

4
pkgs/top-level/qt5-packages.nix
View File

@ -251,7 +251,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum {
qt6Kvantum = pkgs.qt6Packages.qtstyleplugin-kvantum;
};
quazip = callPackage ../development/libraries/quazip { }; quazip = callPackage ../development/libraries/quazip { };

4
pkgs/top-level/qt6-packages.nix
View File

@ -79,9 +79,7 @@ makeScopeWithSplicing' {
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { qtstyleplugin-kvantum = kdePackages.callPackage ../development/libraries/qtstyleplugin-kvantum { };
qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum;
};
qtutilities = callPackage ../development/libraries/qtutilities { }; qtutilities = callPackage ../development/libraries/qtutilities { };