diff options
| author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-08-17 09:05:24 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-09-04 03:12:46 +0000 |
| commit | 468901fff857e5665546ecc85e97ffd104756445 (patch) | |
| tree | beef23e5baf49e23be097c12648bd9b97937b8a5 | |
| parent | cpu-x: nixfmt (diff) | |
| download | nixpkgs-468901fff857e5665546ecc85e97ffd104756445.tar.gz | |
cpu-x: avoid double-wrapping
(cherry picked from commit d4436a5fad20d3dec03fa536db8d0434b14044f9)
| -rw-r--r-- | pkgs/by-name/cp/cpu-x/package.nix | 9 |
1 files 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; { |