diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index 8c2dcb8a8738..24cde3f38989 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -1,26 +1,45 @@ { lib , stdenvNoCC , fetchFromGitHub +, kdeclarative +, plasma-framework +, plasma-workspace , gitUpdater }: stdenvNoCC.mkDerivation rec { pname = "colloid-kde"; - version = "unstable-2022-07-13"; + version = "unstable-2023-07-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "eaf6844e997aa60c755af7ea560ffba798e72ff5"; - hash = "sha256-FNTG5aVvTWHqNVVR23LFG/ykPtXRD7oH5C6eyWaqc60="; + rev = "0b79befdad9b442b5a8287342c4b7e47ff87d555"; + hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA="; }; + # 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/install.sh \ + --replace /usr $out \ + --replace '$(cd $(dirname $0) && pwd)' . \ + --replace '"$UID" -eq "$ROOT_UID"' true + + substituteInPlace sddm/Colloid/Main.qml \ + --replace /usr $out ''; installPhase = '' @@ -31,6 +50,10 @@ stdenvNoCC.mkDerivation rec { name= HOME="$TMPDIR" \ ./install.sh --dest $out/share/themes + mkdir -p $out/share/sddm/themes + cd sddm + source install.sh + runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1171a50e5c1a..4cceaa582a67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29153,7 +29153,9 @@ with pkgs; comfortaa = callPackage ../data/fonts/comfortaa { }; - colloid-kde = callPackage ../data/themes/colloid-kde { }; + colloid-kde = callPackage ../data/themes/colloid-kde { + inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace; + }; comic-mono = callPackage ../data/fonts/comic-mono { };