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

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

authored by scrumplex.net and committed by GitHub 411f1f7b 8621265c

+28 -21
+24 -17
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
··· 2 , stdenv 3 , fetchFromGitHub 4 , fetchpatch 5 , qmake 6 , qtbase 7 , qtsvg ··· 14 , wrapQtAppsHook 15 , gitUpdater 16 17 - , qt5Kvantum ? null 18 }: 19 let 20 - isQt6 = lib.versionAtLeast qtbase.version "6"; 21 in 22 - stdenv.mkDerivation rec { 23 - pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; 24 - version = "1.0.10"; 25 26 src = fetchFromGitHub { 27 owner = "tsujan"; 28 repo = "Kvantum"; 29 - rev = "V${version}"; 30 - sha256 = "48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro="; 31 }; 32 33 nativeBuildInputs = [ 34 qmake 35 qttools 36 wrapQtAppsHook ··· 41 qtsvg 42 libX11 43 libXext 44 - ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] 45 - ++ lib.optional isQt6 qtwayland; 46 47 - sourceRoot = "${src.name}/Kvantum"; 48 49 patches = [ 50 (fetchpatch { ··· 56 ]; 57 58 postPatch = '' 59 - # Fix plugin dir 60 - substituteInPlace style/style.pro \ 61 - --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" 62 ''; 63 64 - postInstall = lib.optionalString isQt6 '' 65 - # make default Kvantum themes available for Qt 6 apps 66 mkdir -p "$out/share" 67 - ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" 68 ''; 69 70 passthru.updateScript = gitUpdater { ··· 78 platforms = platforms.linux; 79 maintainers = with maintainers; [ romildo Scrumplex ]; 80 }; 81 - }
··· 2 , stdenv 3 , fetchFromGitHub 4 , fetchpatch 5 + , cmake 6 , qmake 7 , qtbase 8 , qtsvg ··· 15 , wrapQtAppsHook 16 , gitUpdater 17 18 + , qt6Kvantum ? null 19 }: 20 let 21 + isQt5 = lib.versionOlder qtbase.version "6"; 22 in 23 + stdenv.mkDerivation (finalAttrs: { 24 + pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; 25 + version = "1.1.0"; 26 27 src = fetchFromGitHub { 28 owner = "tsujan"; 29 repo = "Kvantum"; 30 + rev = "V${finalAttrs.version}"; 31 + hash = "sha256-i+QjVPSzWNPVQmQkB+u/3Wrvqqoz5OIjRdyZKXzxZh4="; 32 }; 33 34 nativeBuildInputs = [ 35 + cmake 36 qmake 37 qttools 38 wrapQtAppsHook ··· 43 qtsvg 44 libX11 45 libXext 46 + kwindowsystem 47 + ] ++ lib.optionals isQt5 [ qtx11extras ] 48 + ++ lib.optionals (!isQt5) [ qtwayland ]; 49 50 + sourceRoot = "${finalAttrs.src.name}/Kvantum"; 51 52 patches = [ 53 (fetchpatch { ··· 59 ]; 60 61 postPatch = '' 62 + substituteInPlace style/CMakeLists.txt \ 63 + --replace-fail '"''${_Qt6_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/" \ 64 + --replace-fail '"''${_Qt5_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/" 65 ''; 66 67 + cmakeFlags = [ 68 + (lib.cmakeBool "ENABLE_QT5" isQt5) 69 + ]; 70 + 71 + postInstall = lib.optionalString isQt5 '' 72 + # make default Kvantum themes available for Qt 5 apps 73 mkdir -p "$out/share" 74 + ln -s "${qt6Kvantum}/share/Kvantum" "$out/share/Kvantum" 75 ''; 76 77 passthru.updateScript = gitUpdater { ··· 85 platforms = platforms.linux; 86 maintainers = with maintainers; [ romildo Scrumplex ]; 87 }; 88 + })
+3 -1
pkgs/top-level/qt5-packages.nix
··· 251 252 qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; 253 254 - qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; 255 256 quazip = callPackage ../development/libraries/quazip { }; 257
··· 251 252 qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; 253 254 + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { 255 + qt6Kvantum = pkgs.qt6Packages.qtstyleplugin-kvantum; 256 + }; 257 258 quazip = callPackage ../development/libraries/quazip { }; 259
+1 -3
pkgs/top-level/qt6-packages.nix
··· 79 80 qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; 81 82 - qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { 83 - qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum; 84 - }; 85 86 qtutilities = callPackage ../development/libraries/qtutilities { }; 87
··· 79 80 qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; 81 82 + qtstyleplugin-kvantum = kdePackages.callPackage ../development/libraries/qtstyleplugin-kvantum { }; 83 84 qtutilities = callPackage ../development/libraries/qtutilities { }; 85