From e2450857bed3bd001565edc4c14ba6fd0c7e5766 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 17 Apr 2025 13:04:57 -0600 Subject: [PATCH] clean up the flake a bit --- flake.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c6b4877..b73e439 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,14 @@ naersk' = pkgs.callPackage naersk {}; + # Setting variables that everything uses + LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib"; + CLANG_PATH = "${pkgs.llvmPackages.clang}/bin/clang"; + in rec { # For `nix build` & `nix run`: defaultPackage = naersk'.buildPackage { - LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib"; - CLANG_PATH = "${pkgs.llvmPackages.clang}/bin/clang"; + inherit LIBCLANG_PATH CLANG_PATH; buildInputs = with pkgs; [ pkg-config openssl ]; nativeBuildInputs = with pkgs; [ util-linux.dev ]; src = ./.; @@ -28,8 +31,7 @@ # For `nix develop` (optional, can be skipped): devShell = pkgs.mkShell { - LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib"; - CLANG_PATH = "${pkgs.llvmPackages.clang}/bin/clang"; + inherit LIBCLANG_PATH CLANG_PATH; buildInputs = with pkgs; [ pkg-config openssl ]; nativeBuildInputs = with pkgs; [ rustc cargo util-linux.dev ]; };