From dde154d5a4c3e4b90097aabdc981c90a37d81da4 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 15 May 2024 22:14:28 -0500 Subject: [PATCH 1/2] kde-rounded-corners: switch to kdePackages --- .../kwin-decorations/kde-rounded-corners/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 99c5f7fe3fe0..5d2745e64974 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -3,8 +3,9 @@ , cmake , extra-cmake-modules , wrapQtAppsHook +, qtbase , kwin -, kdelibs4support +, kcmutils , libepoxy , libxcb , lib @@ -21,13 +22,8 @@ stdenv.mkDerivation rec { hash = "sha256-g7gNFv4/ighfxYz/VXF5KvcoT6t4lT5soDLlV3oAKvc="; }; - postConfigure = '' - substituteInPlace cmake_install.cmake \ - --replace "${kdelibs4support}" "$out" - ''; - nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ kwin kdelibs4support libepoxy libxcb ]; + buildInputs = [ kcmutils kwin libepoxy libxcb qtbase ]; meta = with lib; { description = "Rounds the corners of your windows"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05aca9f4018f..dc553d278b94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28666,7 +28666,7 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { }; - kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; khmeros = callPackage ../data/fonts/khmeros { }; From 29268b929462c515892a7cde9f5e6619a03682c9 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 20 May 2024 16:20:14 -0500 Subject: [PATCH 2/2] kde-rounded-corners: add devusb to maintainers --- .../themes/kwin-decorations/kde-rounded-corners/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 5d2745e64974..e7b5f13e6a7a 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Rounds the corners of your windows"; homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ devusb ]; }; }