From d3122d7a9290b18f3e3dc86af7ac83654d659cb4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Nov 2025 13:00:49 +0100 Subject: [PATCH 1/3] projecteur: use `finalAttrs` pattern --- pkgs/os-specific/linux/projecteur/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 1ee127f15b80..b4c55d9cb9a0 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -10,14 +10,14 @@ udevCheckHook, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "projecteur"; version = "0.10"; src = fetchFromGitHub { owner = "jahnf"; repo = "Projecteur"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = false; hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A="; }; @@ -56,4 +56,4 @@ mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) From 5007dc33a72e43d34937f9fd9226d89e2e0d8393 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Nov 2025 13:03:04 +0100 Subject: [PATCH 2/3] projecteur: add `versionCheckHook` --- pkgs/os-specific/linux/projecteur/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index b4c55d9cb9a0..726728539586 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -8,6 +8,7 @@ qtgraphicaleffects, wrapQtAppsHook, udevCheckHook, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -38,14 +39,16 @@ stdenv.mkDerivation (finalAttrs: { udevCheckHook ]; - doInstallCheck = true; - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}" "-DPACKAGE_TARGETS=OFF" "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)"; homepage = "https://github.com/jahnf/Projecteur"; From a0e4d5fa7e8a0b92dc0235634aebd32a89cc0b66 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Nov 2025 14:08:42 +0100 Subject: [PATCH 3/3] projecteur: remove obsolete `postPatch` step --- pkgs/os-specific/linux/projecteur/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 726728539586..30ae0ba4543d 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A="; }; - postPatch = '' - sed '1i#include ' -i src/device.h # gcc12 - ''; - buildInputs = [ qtbase qtgraphicaleffects