diff options
| -rw-r--r-- | pkgs/data/themes/qogir-kde/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix index 44182aa3f45a..1dd3deba8dff 100644 --- a/pkgs/data/themes/qogir-kde/default.nix +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -1,26 +1,40 @@ { lib , stdenvNoCC , fetchFromGitHub +, kdeclarative +, plasma-framework +, plasma-workspace , gitUpdater }: stdenvNoCC.mkDerivation rec { pname = "qogir-kde"; - version = "unstable-2022-07-08"; + version = "unstable-2023-10-20"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "f240eae10978c7fee518f7a8be1c41a21a9d5c2e"; - hash = "sha256-AV60IQWwgvLwDO3ylILwx1DkKadwo4isn3JX3WpKoxQ="; + rev = "1cfe8da54e6f76d5ce0d2234dcb4f5186431edb3"; + hash = "sha256-Ts8cS7dH8RkfRgWvzDKLCC2G6Hsnvx0NAGstfxMIt+Y="; }; + # Propagate sddm theme dependencies to user env otherwise sddm does + # not find them. Putting them in buildInputs is not enough. + propagatedUserEnvPkgs = [ + kdeclarative.bin + plasma-framework + plasma-workspace + ]; + postPatch = '' patchShebangs install.sh substituteInPlace install.sh \ --replace '$HOME/.local' $out \ --replace '$HOME/.config' $out/share + + substituteInPlace sddm/*/Main.qml \ + --replace /usr $out ''; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0fe2f5436b7..a76d68f76756 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29875,7 +29875,9 @@ with pkgs; qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; - qogir-kde = callPackage ../data/themes/qogir-kde { }; + qogir-kde = callPackage ../data/themes/qogir-kde { + inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace; + }; qogir-theme = callPackage ../data/themes/qogir { }; |