From e79b396303c55e905922654d2333d9fe95a70a3a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 26 Mar 2024 21:51:27 -0500 Subject: [PATCH 1/2] catppuccin-sddm-corners: unstable-2023-02-17 -> unstable-2023-05-30 --- pkgs/data/themes/catppuccin-sddm-corners/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/catppuccin-sddm-corners/default.nix b/pkgs/data/themes/catppuccin-sddm-corners/default.nix index fe2fa9b9fb77..ab58309eb260 100644 --- a/pkgs/data/themes/catppuccin-sddm-corners/default.nix +++ b/pkgs/data/themes/catppuccin-sddm-corners/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "catppuccin-sddm-corners"; - version = "unstable-2023-02-17"; + version = "unstable-2023-05-30"; src = fetchFromGitHub { owner = "khaneliman"; repo = "catppuccin-sddm-corners"; - rev = "7b7a86ee9a5a2905e7e6623d2af5922ce890ef79"; - hash = "sha256-sTnt8RarNXz3RmYfmx4rD+nMlY8rr2n0EN3ntPzOurw="; + rev = "ffaad5c8964b52ccd92a80dfd3a7931c8b68c446"; + hash = "sha256-CaCMrXlwt7JfSycB8WH3XCWUu+i7bPSfFv3duo7ZlZo="; }; dontConfigure = true; From ed0c2371a111791f347bb962be8a6760d6a3dda9 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 26 Mar 2024 21:59:07 -0500 Subject: [PATCH 2/2] catppuccin-sddm-corners: add qt dependencies Continuation of https://github.com/NixOS/nixpkgs/pull/273514 --- .../themes/catppuccin-sddm-corners/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/data/themes/catppuccin-sddm-corners/default.nix b/pkgs/data/themes/catppuccin-sddm-corners/default.nix index ab58309eb260..952399f7bf86 100644 --- a/pkgs/data/themes/catppuccin-sddm-corners/default.nix +++ b/pkgs/data/themes/catppuccin-sddm-corners/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, libsForQt5 , unstableGitUpdater }: @@ -17,6 +18,20 @@ stdenvNoCC.mkDerivation { dontConfigure = true; dontBuild = true; + dontWrapQtApps = true; + + propagatedBuildInputs = with libsForQt5.qt5; [ + qtgraphicaleffects + qtquickcontrols2 + qtsvg + ]; + + postFixup = '' + mkdir -p $out/nix-support + echo ${libsForQt5.qt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages + echo ${libsForQt5.qt5.qtquickcontrols2} >> $out/nix-support/propagated-user-env-packages + echo ${libsForQt5.qt5.qtsvg} >> $out/nix-support/propagated-user-env-packages + ''; installPhase = '' runHook preInstall