From d4436a5fad20d3dec03fa536db8d0434b14044f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:05:24 -0400
Subject: [PATCH] cpu-x: avoid double-wrapping

---
 pkgs/by-name/cp/cpu-x/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix
index 08fd73a5e0f4..ee148ac4decf 100644
--- a/pkgs/by-name/cp/cpu-x/package.nix
+++ b/pkgs/by-name/cp/cpu-x/package.nix
@@ -11,7 +11,6 @@
   procps,
   wrapGAppsHook3,
   nasm,
-  makeWrapper,
   opencl-headers,
   ocl-icd,
   vulkan-headers,
@@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
     pkg-config
     wrapGAppsHook3
     nasm
-    makeWrapper
   ];
 
   buildInputs = [
@@ -80,10 +78,11 @@ stdenv.mkDerivation rec {
     libXtst
   ];
 
-  postInstall = ''
-    wrapProgram $out/bin/cpu-x \
-      --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
       --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+    )
   '';
 
   meta = with lib; {