nixos

commit 7b2331772694d1e85c1413bd7a1439aab57af97b
parent cb5e0e72621a5cfe274f41979317dec6d00ec1d7
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 30 Sep 2023 21:13:31 +0200

Try more modern workaround for bindgen

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

1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/nixos/common/lib/github-runner.nix b/nixos/common/lib/github-runner.nix
@@ -50,13 +50,14 @@
         YARA_LIBRARY_PATH = "${pkgs.yara}/lib";
         YARA_INCLUDE_DIR = "${pkgs.yara}/include";
         LIBCLANG_PATH = "${pkgs.clang.cc.lib}/lib";
-        BINDGEN_EXTRA_CLANG_ARGS = "$(< ${pkgs.stdenv.cc}/nix-support/libc-crt1-cflags) \
-          $(< ${pkgs.stdenv.cc}/nix-support/libc-cflags) \
-          $(< ${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"} \
-        ";
+        # BINDGEN_EXTRA_CLANG_ARGS = "$(< ${pkgs.stdenv.cc}/nix-support/libc-crt1-cflags) \
+        #   $(< ${pkgs.stdenv.cc}/nix-support/libc-cflags) \
+        #   $(< ${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"} \
+        # ";
+        BINDGEN_EXTRA_CLANG_ARGS = "$(< ${pkgs.clang}/nix-support/cc-cflags) $(< ${pkgs.clang}/nix-support/libc-cflags) $(< ${pkgs.clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE";
       };
     };
   };