From 5429deb8880b6988b462bd20e2af77dd9a3e1b95 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 17 Sep 2025 18:32:42 +0800 Subject: [PATCH] switcheroo-control: 2.6 -> 3.0 Diff: https://gitlab.freedesktop.org/hadess/switcheroo-control/-/compare/2.6...3.0 Changelog: https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/3.0/NEWS --- .../by-name/sw/switcheroo-control/package.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sw/switcheroo-control/package.nix b/pkgs/by-name/sw/switcheroo-control/package.nix index 1a45d35ac3fd..2a824e9b3aad 100644 --- a/pkgs/by-name/sw/switcheroo-control/package.nix +++ b/pkgs/by-name/sw/switcheroo-control/package.nix @@ -4,39 +4,50 @@ meson, fetchFromGitLab, systemd, + libdrm, libgudev, pkg-config, + wrapGAppsNoGuiHook, glib, python3Packages, }: -python3Packages.buildPythonApplication rec { +let + version = "3.0"; +in +python3Packages.buildPythonApplication { pname = "switcheroo-control"; - version = "2.6"; - - format = "other"; + inherit version; + pyproject = false; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "hadess"; repo = "switcheroo-control"; - rev = version; - hash = "sha256-F+5HhMxM8pcnAGmVBARKWNCL0rIEzHW/jsGHHqYZJug="; + tag = version; + hash = "sha256-7P0o8fBYe4izRmNL7DimUSJfzj13KXW9we6c/A2iNo8="; }; + postPatch = '' + substituteInPlace data/meson.build \ + --replace-fail "rules_dir" "'${placeholder "out"}/lib/udev/rules.d'" + ''; + nativeBuildInputs = [ ninja meson pkg-config + wrapGAppsNoGuiHook ]; buildInputs = [ systemd + libdrm libgudev glib ]; - propagatedBuildInputs = [ + dependencies = [ python3Packages.pygobject3 ]; @@ -45,6 +56,10 @@ python3Packages.buildPythonApplication rec { "-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d" ]; + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + meta = { description = "D-Bus service to check the availability of dual-GPU"; mainProgram = "switcherooctl";