Merge pull request #123 from winterqt/fix-build-on-newer-nix

Fix build on Nix 2.19+
zhaofengli · Mar 29, 2024 · 4dbdbee · 4dbdbee
2 parents 6eabc3f + 657db64
commit 4dbdbee
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/attic/build.rs b/attic/build.rs
@@ -24,6 +24,9 @@ fn build_bridge() {
         .flag("nix/config.h")
         .flag("-idirafter")
         .flag(hacky_include.path().to_str().unwrap())
+        // In Nix 2.19+, nix/args/root.hh depends on being able to #include "root.hh" (which is in its parent directory), for some reason
+        .flag("-I")
+        .flag(concat!(env!("NIX_INCLUDE_PATH"), "/nix"))
         .compile("nixbinding");
 
     println!("cargo:rerun-if-changed=src/nix_store/bindings");

diff --git a/crane.nix b/crane.nix
@@ -62,10 +62,8 @@ let
 
     ATTIC_DISTRIBUTOR = "attic";
 
-    # Workaround for https://github.com/NixOS/nixpkgs/issues/166205
-    env = lib.optionalAttrs stdenv.cc.isClang {
-      NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
-    };
+    # See comment in `attic/build.rs`
+    NIX_INCLUDE_PATH = "${lib.getDev nix}/include";
 
     # See comment in `attic-tests`
     doCheck = false;
@@ -135,17 +133,15 @@ let
 
     nativeBuildInputs = nativeBuildInputs ++ [ jq ];
 
-    # Workaround for https://github.com/NixOS/nixpkgs/issues/166205
-    env = lib.optionalAttrs stdenv.cc.isClang {
-      NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
-    };
-
     doCheck = true;
 
     buildPhaseCargoCommand = "";
     checkPhaseCargoCommand = "cargoWithProfile test --no-run --message-format=json >cargo-test.json";
     doInstallCargoArtifacts = false;
 
+    # See comment in `attic/build.rs`
+    NIX_INCLUDE_PATH = "${lib.getDev nix}/include";
+
     installPhase = ''
       runHook preInstall
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -130,6 +130,9 @@
         NIX_PATH = "nixpkgs=${pkgs.path}";
         RUST_SRC_PATH = "${pkgs.rustPlatform.rustcSrc}/library";
 
+        # See comment in `attic/build.rs`
+        NIX_INCLUDE_PATH = "${lib.getDev pkgs.nix}/include";
+
         ATTIC_DISTRIBUTOR = "dev";
       };
 

diff --git a/package.nix b/package.nix
@@ -49,10 +49,8 @@ in rustPlatform.buildRustPackage rec {
 
   ATTIC_DISTRIBUTOR = "attic";
 
-  # Workaround for https://github.com/NixOS/nixpkgs/issues/166205
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
-  };
+  # See comment in `attic/build.rs`
+  NIX_INCLUDE_PATH = "${lib.getDev nix}/include";
 
   # Recursive Nix is not stable yet
   doCheck = false;