cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #234298 from wegank/zenith-refactor

Browse source 
zenith: migrate to bindgenHook
This commit is contained in:
Weijia Wang 2023-05-27 00:46:10 +03:00 committed by GitHub
commit 3eb0cc7c0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/system/zenith/default.nix
View file

@ -5,7 +5,6 @@
, IOKit , IOKit
, nvidiaSupport ? false , nvidiaSupport ? false
, makeWrapper , makeWrapper
, llvmPackages
}: }:
assert nvidiaSupport -> stdenv.isLinux; assert nvidiaSupport -> stdenv.isLinux;
@ -34,13 +33,11 @@ rustPlatform.buildRustPackage rec {
}; };
}; };
nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper;
buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
buildFeatures = lib.optional nvidiaSupport "nvidia"; buildFeatures = lib.optional nvidiaSupport "nvidia";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
postInstall = lib.optionalString nvidiaSupport '' postInstall = lib.optionalString nvidiaSupport ''
wrapProgram $out/bin/zenith \ wrapProgram $out/bin/zenith \
--suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib" --suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib"