From 4e04adc0b7ef8ed0f723a537bf1249deda7f5051 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 5 Sep 2023 11:25:48 +0800 Subject: [PATCH] gammaray: 2.11.3 -> 3.0.0 --- pkgs/development/tools/gammaray/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/development/tools/gammaray/default.nix index aa334bfd2e42..29ab4973c994 100644 --- a/pkgs/development/tools/gammaray/default.nix +++ b/pkgs/development/tools/gammaray/default.nix @@ -4,6 +4,7 @@ , cmake , pkg-config , wrapQtAppsHook +, qtbase , wayland , elfutils , libbfd @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gammaray"; - version = "2.11.3"; + version = "3.0.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - hash = "sha256-ZFLHBPIjkbHlsatwuXdut1C5MpdkVUb9T7TTNhtP764="; + hash = "sha256-C8bej0q4p8F27hiJUye9G+sZbkAYaV8hW1GKWZyHAis="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + qtbase wayland elfutils libbfd @@ -38,6 +40,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ rewine ]; + mainProgram = "gammaray"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3b19bc78c9..f968c8fdbb58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3772,7 +3772,7 @@ with pkgs; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gammaray = libsForQt5.callPackage ../development/tools/gammaray { }; + gammaray = qt6Packages.callPackage ../development/tools/gammaray { }; gams = callPackage ../tools/misc/gams (config.gams or {});