Add patch to rules_nixpkgs_core module

tweag · Jul 8, 2024 · 54b801e · 54b801e
1 parent 720a70b
commit 54b801e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 0 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -127,6 +127,11 @@ bazel_dep(
     version = "0.11.1",
     dev_dependency = True,
 )
+single_version_override(
+    module_name = "rules_nixpkgs_cc",
+    patch_strip = 3,
+    patches = ["//haskell:private/rules_nixpkgs-libcxxabi.diff"],
+)
 bazel_dep(
     name = "rules_nixpkgs_python",
     version = "0.11.1",

diff --git a/haskell/private/rules_nixpkgs-libcxxabi.diff b/haskell/private/rules_nixpkgs-libcxxabi.diff
@@ -0,0 +1,17 @@
+diff --git a/toolchains/cc/cc.nix b/toolchains/cc/cc.nix
+index e77d97c7..32c724dc 100644
+--- a/toolchains/cc/cc.nix
++++ b/toolchains/cc/cc.nix
+@@ -40,10 +40,11 @@ let
+         echo "-F${Foundation}/Library/Frameworks" >> $out/nix-support/cc-cflags
+         echo "-F${SystemConfiguration}/Library/Frameworks" >> $out/nix-support/cc-cflags
+         echo "-L${pkgs.llvmPackages.libcxx}/lib" >> $out/nix-support/cc-cflags
+-        echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
+         echo "-L${pkgs.libiconv}/lib" >> $out/nix-support/cc-cflags
+         echo "-L${pkgs.darwin.libobjc}/lib" >> $out/nix-support/cc-cflags
+         echo "-resource-dir=${pkgs.stdenv.cc}/resource-root" >> $out/nix-support/cc-cflags
++      '' + pkgs.lib.optionalString (builtins.hasAttr "libcxxabi" pkgs.llvmPackages) ''
++        echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
+       '';
+     };
+   cc =
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -23,6 +23,11 @@ bazel_dep(
     name = "rules_nixpkgs_cc",
     version = "0.11.1",
 )
+single_version_override(
+    module_name = "rules_nixpkgs_cc",
+    patch_strip = 3,
+    patches = ["//:rules_nixpkgs-libcxxabi.diff"],
+)
 bazel_dep(
     name = "rules_nixpkgs_python",
     version = "0.11.1",

diff --git a/rules_haskell_tests/rules_nixpkgs-libcxxabi.diff b/rules_haskell_tests/rules_nixpkgs-libcxxabi.diff
@@ -0,0 +1,17 @@
+diff --git a/toolchains/cc/cc.nix b/toolchains/cc/cc.nix
+index e77d97c7..32c724dc 100644
+--- a/toolchains/cc/cc.nix
++++ b/toolchains/cc/cc.nix
+@@ -40,10 +40,11 @@ let
+         echo "-F${Foundation}/Library/Frameworks" >> $out/nix-support/cc-cflags
+         echo "-F${SystemConfiguration}/Library/Frameworks" >> $out/nix-support/cc-cflags
+         echo "-L${pkgs.llvmPackages.libcxx}/lib" >> $out/nix-support/cc-cflags
+-        echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
+         echo "-L${pkgs.libiconv}/lib" >> $out/nix-support/cc-cflags
+         echo "-L${pkgs.darwin.libobjc}/lib" >> $out/nix-support/cc-cflags
+         echo "-resource-dir=${pkgs.stdenv.cc}/resource-root" >> $out/nix-support/cc-cflags
++      '' + pkgs.lib.optionalString (builtins.hasAttr "libcxxabi" pkgs.llvmPackages) ''
++        echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
+       '';
+     };
+   cc =