From 462aa0d282224913c62497541c6d2ef43fcb14a7 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 15 Apr 2024 14:53:36 +0200
Subject: [PATCH 1/4] libvibrant: 2100c09 -> 1.1.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/li/libvibrant/package.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/li/libvibrant/package.nix b/pkgs/by-name/li/libvibrant/package.nix
index 905ad34d29ea..0ff4546499b7 100644
--- a/pkgs/by-name/li/libvibrant/package.nix
+++ b/pkgs/by-name/li/libvibrant/package.nix
@@ -2,31 +2,38 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, makeWrapper
 , libX11
 , libXrandr
 , linuxPackages
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libvibrant";
-  version = "2100c09";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "libvibrant";
     repo = "libvibrant";
-    rev = version;
-    hash = "sha256-nVODwP/PQgYBTHnSplgrkdNOLsF7N+vZ8iPL7gArVNY=";
+    rev = finalAttrs.version;
+    hash = "sha256-APja211+U0WVuCRz8f3VIAQLF4oPhh0CJ3Y5EgSJnh0=";
   };
 
-  buildInputs = [ libX11 libXrandr linuxPackages.nvidia_x11.settings.libXNVCtrl ];
-  nativeBuildInputs = [ cmake makeWrapper ];
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    libX11
+    libXrandr
+    linuxPackages.nvidia_x11.settings.libXNVCtrl
+  ];
 
   meta = with lib; {
     description = "Simple library to adjust color saturation of X11 outputs";
     homepage = "https://github.com/libvibrant/libvibrant";
-    license = licenses.mit;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ Scrumplex ];
     mainProgram = "vibrant-cli";
   };
-}
+})

From 74ed1f82de5534439ce2a19d925947fccd2b80cb Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 10 Nov 2024 14:39:30 +0100
Subject: [PATCH 2/4] libvibrant: nixfmt

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/li/libvibrant/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/libvibrant/package.nix b/pkgs/by-name/li/libvibrant/package.nix
index 0ff4546499b7..c6dab911b41e 100644
--- a/pkgs/by-name/li/libvibrant/package.nix
+++ b/pkgs/by-name/li/libvibrant/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, libX11
-, libXrandr
-, linuxPackages
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  libX11,
+  libXrandr,
+  linuxPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {

From f2ea5ad6a970c39ab8e174084b07371104dda5e6 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 10 Nov 2024 14:43:14 +0100
Subject: [PATCH 3/4] vibrantlinux: 2.1.10 -> 2.2.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/vi/vibrantlinux/package.nix | 54 +++++++++++-------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/vi/vibrantlinux/package.nix b/pkgs/by-name/vi/vibrantlinux/package.nix
index f28b246afdfd..425fbae0f6c5 100644
--- a/pkgs/by-name/vi/vibrantlinux/package.nix
+++ b/pkgs/by-name/vi/vibrantlinux/package.nix
@@ -1,55 +1,49 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, qt5
-, makeWrapper
+, cmake
 , libvibrant
-, libX11
-, libXrandr
 , libxcb
-, linuxPackages
+, libXrandr
+, pkg-config
+, qt6
+,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vibrantLinux";
-  version = "2.1.10";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "libvibrant";
     repo = "vibrantLinux";
-    rev = "v${version}";
-    hash = "sha256-rvJiVId6221hTrfEIvVO9HTMhaZ6KY44Bu3a5MinPHI=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-GsGWQ6Os8GQ1XbRKrlTOpwPvwyfT/6ftjlt+fJ/YiK8=";
   };
 
   nativeBuildInputs = [
-    makeWrapper
-  ] ++ (with qt5; [
-    qmake
-    wrapQtAppsHook
-  ]);
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
 
   buildInputs = [
-    libX11
-    libXrandr
-    libxcb
     libvibrant
-    linuxPackages.nvidia_x11.settings.libXNVCtrl
-  ] ++ (with qt5; [
-    qtbase
-    qttools
-  ]);
-
-  postPatch = ''
-    substituteInPlace vibrantLinux.pro \
-      --replace '$$(PREFIX)' '$$PREFIX'
-  '';
+    libxcb
+    libXrandr
+    qt6.qtbase
+    qt6.qttools
+  ];
 
   meta = with lib; {
     description = "Tool to automate managing your screen's saturation depending on what programs are running";
     homepage = "https://github.com/libvibrant/vibrantLinux";
-    license = licenses.mit;
-    maintainers = with maintainers; [ unclamped ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [
+      Scrumplex
+      unclamped
+    ];
     platforms = platforms.linux;
     mainProgram = "vibrantLinux";
   };
-}
+})

From b6af12e739f46768bfef54ab02b04c3b4bcbc08b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 10 Nov 2024 14:43:25 +0100
Subject: [PATCH 4/4] vibrantlinux: nixfmt

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/vi/vibrantlinux/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/vi/vibrantlinux/package.nix b/pkgs/by-name/vi/vibrantlinux/package.nix
index 425fbae0f6c5..40821c700d63 100644
--- a/pkgs/by-name/vi/vibrantlinux/package.nix
+++ b/pkgs/by-name/vi/vibrantlinux/package.nix
@@ -1,13 +1,13 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, libvibrant
-, libxcb
-, libXrandr
-, pkg-config
-, qt6
-,
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  libvibrant,
+  libxcb,
+  libXrandr,
+  pkg-config,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {