diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 547e4f30aa6ca..f3be976d4ae66 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "kde2-decoration"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "repos-holder"; repo = "kdecoration2-kde2"; rev = version; - sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; + sha256 = "1iyvk02sa6vdqxgsjj6mz7c7qmhz8jlblqadxrf14lc4gs7vasnb"; }; enableParallelBuilding = true; diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 719b1ce1a487b..7391bd54780a2 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -23,6 +23,10 @@ in mkDerivation { url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; }) + (fetchpatch { + url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch"; + sha256 = "0xc78lxsclxzvj8v8b8mkylamz4qdlx9ng297ckhs0qy3dfkcjk3"; + }) ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6269c16b5cf7e..a8e4c9f50aac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15259,6 +15259,8 @@ in kdb = callPackage ../development/libraries/kdb { }; + kde2-decoration = callPackage ../data/themes/kde2 { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kdsoap = callPackage ../development/libraries/kdsoap { }; @@ -15333,6 +15335,8 @@ in withQt5 = true; }; + qtcurve = callPackage ../data/themes/qtcurve {}; + qtutilities = callPackage ../development/libraries/qtutilities { }; qtinstaller = callPackage ../development/libraries/qtinstaller { }; @@ -19272,8 +19276,6 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; - kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -19526,8 +19528,6 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; - redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; route159 = callPackage ../data/fonts/route159 { };