vibrantlinux: 2.1.10 -> 2.2.0 (#304265)

pkgs/by-name/li/libvibrant/package.nix

@@ -1,32 +1,40 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, makeWrapper
-, libX11
-, libXrandr
-, linuxPackages
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  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";
   };
-}
+})

pkgs/by-name/vi/vibrantlinux/package.nix

@@ -1,55 +1,49 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, qt5
-, makeWrapper
-, libvibrant
-, libX11
-, libXrandr
-, libxcb
-, linuxPackages
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  libvibrant,
+  libxcb,
+  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";
   };
-}
+})