From ead776d8a82bf3828150433410c43109b8152230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 31 Oct 2023 18:06:54 -0300 Subject: [PATCH] layan-kde: 2022-02-13 -> unstable-2023-09-30 - Update version - Propagate sddm theme dependencies to user env --- pkgs/data/themes/layan-kde/default.nix | 20 +++++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix index 3b030337b7bc..7ca55d1dc74f 100644 --- a/pkgs/data/themes/layan-kde/default.nix +++ b/pkgs/data/themes/layan-kde/default.nix @@ -1,26 +1,40 @@ { stdenv , lib , fetchFromGitHub +, kdeclarative +, plasma-framework +, plasma-workspace , gitUpdater }: stdenv.mkDerivation rec { pname = "layan-kde"; - version = "2022-02-13"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "09z90g13l26v23nwr8n5bapwldp3hhdrdikynvm4vvb7qsvb4vrp"; + rev = "7ab7cd7461dae8d8d6228d3919efbceea5f4272c"; + hash = "sha256-Wh8tZcQEdTTlgtBf4ovapojHcpPBZDDkWOclmxZv9zA="; }; + # 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 53d021424469..4ae687e79c10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29507,7 +29507,9 @@ with pkgs; layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; - layan-kde = callPackage ../data/themes/layan-kde { }; + layan-kde = callPackage ../data/themes/layan-kde { + inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace; + }; lao = callPackage ../data/fonts/lao { };