From 785d16a7ebd770231f05e30b9887d383b69af769 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 26 May 2023 23:52:21 +0300 Subject: [PATCH] zenith: migrate to bindgenHook --- pkgs/tools/system/zenith/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 8de44e2fae3f..4318ba492aee 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -5,7 +5,6 @@ , IOKit , nvidiaSupport ? false , makeWrapper -, llvmPackages }: assert nvidiaSupport -> stdenv.isLinux; @@ -34,13 +33,11 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; - buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; buildFeatures = lib.optional nvidiaSupport "nvidia"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - postInstall = lib.optionalString nvidiaSupport '' wrapProgram $out/bin/zenith \ --suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib"