nixos

commit eedba72a02c445c99af3b1390bc4fb1fab7a60fb
parent ce00e310c5fbb433d2f9c9b60db12860560900b3
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 30 Sep 2023 20:55:45 +0200

Try with vars again

Diffstat:
M
nixos/common/lib/github-runner.nix
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/nixos/common/lib/github-runner.nix b/nixos/common/lib/github-runner.nix
@@ -49,14 +49,14 @@
       extraEnvironment = {
         YARA_LIBRARY_PATH = "${pkgs.yara}/lib";
         YARA_INCLUDE_DIR = "${pkgs.yara}/include";
-        # LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib";
-        # BINDGEN_EXTRA_CLANG_ARGS = "$(< ${pkgs.stdenv.cc}/nix-support/libc-crt1-cflags) \
-        #   $(< ${pkgs.stdenv.cc}/nix-support/libc-cflags) \
-        #   $(< ${pkgs.pkgs.stdenv.cc}/nix-support/cc-cflags) \
-        #   $(< ${pkgs.stdenv.cc}/nix-support/libcxx-cxxflags) \
-        #   ${lib.optionalString pkgs.stdenv.cc.isClang "-idirafter ${pkgs.stdenv.cc.cc}/lib/clang/${lib.getVersion pkgs.stdenv.cc.cc}/include"} \
-        #   ${lib.optionalString pkgs.stdenv.cc.isGNU "-isystem ${pkgs.stdenv.cc.cc}/include/c++/${lib.getVersion pkgs.stdenv.cc.cc} -isystem ${pkgs.stdenv.cc.cc}/include/c++/${lib.getVersion pkgs.stdenv.cc.cc}/${pkgs.stdenv.hostPlatform.config} -idirafter ${pkgs.stdenv.cc.cc}/lib/gcc/${pkgs.stdenv.hostPlatform.config}/${lib.getVersion pkgs.stdenv.cc.cc}/include"} \
-        # ";
+        LIBCLANG_PATH = "${pkgs.llvmPackages.libclang}/lib";
+        BINDGEN_EXTRA_CLANG_ARGS = "$(< ${pkgs.stdenv.cc}/nix-support/libc-crt1-cflags) \
+          $(< ${pkgs.stdenv.cc}/nix-support/libc-cflags) \
+          $(< ${pkgs.pkgs.stdenv.cc}/nix-support/cc-cflags) \
+          $(< ${pkgs.stdenv.cc}/nix-support/libcxx-cxxflags) \
+          ${lib.optionalString pkgs.stdenv.cc.isClang "-idirafter ${pkgs.stdenv.cc.cc}/lib/clang/${lib.getVersion pkgs.stdenv.cc.cc}/include"} \
+          ${lib.optionalString pkgs.stdenv.cc.isGNU "-isystem ${pkgs.stdenv.cc.cc}/include/c++/${lib.getVersion pkgs.stdenv.cc.cc} -isystem ${pkgs.stdenv.cc.cc}/include/c++/${lib.getVersion pkgs.stdenv.cc.cc}/${pkgs.stdenv.hostPlatform.config} -idirafter ${pkgs.stdenv.cc.cc}/lib/gcc/${pkgs.stdenv.hostPlatform.config}/${lib.getVersion pkgs.stdenv.cc.cc}/include"} \
+        ";
       };
     };
   };