Fixes #94 - crateOverrides is not an argument to buildRustCrate

instead we need to override defaultCrateOverrides of buildRustCrate.
nix-community · Feb 12, 2020 · b567d8c · b567d8c
1 parent 4c6868a
commit b567d8c
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 26 deletions.
diff --git a/crate2nix/Cargo.nix b/crate2nix/Cargo.nix
@@ -3417,12 +3417,18 @@ rec {
         }
       );
 
-  /* A restricted overridable version of buildRustCrateWithFeaturesImpl. */
+  /* A restricted overridable version of builtRustCratesWithFeatures. */
   buildRustCrateWithFeatures =
     { packageId
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
-    , buildRustCrateFunc ? buildRustCrate
+    , buildRustCrateFunc ? (
+        if crateOverrides == pkgs.defaultCrateOverrides
+        then buildRustCrate
+        else buildRustCrate.override {
+          defaultCrateOverrides = crateOverrides;
+        }
+      )
     , runTests ? false
     , testCrateFlags ? []
     }:
@@ -3431,11 +3437,11 @@ rec {
           { features, crateOverrides, runTests, testCrateFlags }:
             let
               builtRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = false;
               };
               builtTestRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = true;
               };
               drv = builtRustCrates.${packageId};
@@ -3445,12 +3451,13 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags; };
 
-  /* Returns a buildRustCrate derivation for the given packageId and features. */
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
+     for the corresponding crate. 
+  */
   builtRustCratesWithFeatures =
     { packageId
     , features
     , crateConfigs ? crates
-    , crateOverrides
     , buildRustCrateFunc
     , runTests
     , target ? defaultTarget

diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix
@@ -113,12 +113,18 @@ rec {
         }
       );
 
-  /* A restricted overridable version of buildRustCrateWithFeaturesImpl. */
+  /* A restricted overridable version of builtRustCratesWithFeatures. */
   buildRustCrateWithFeatures =
     { packageId
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
-    , buildRustCrateFunc ? buildRustCrate
+    , buildRustCrateFunc ? (
+        if crateOverrides == pkgs.defaultCrateOverrides
+        then buildRustCrate
+        else buildRustCrate.override {
+          defaultCrateOverrides = crateOverrides;
+        }
+      )
     , runTests ? false
     , testCrateFlags ? []
     }:
@@ -127,11 +133,11 @@ rec {
           { features, crateOverrides, runTests, testCrateFlags }:
             let
               builtRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = false;
               };
               builtTestRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = true;
               };
               drv = builtRustCrates.${packageId};
@@ -141,12 +147,13 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags; };
 
-  /* Returns a buildRustCrate derivation for the given packageId and features. */
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
+     for the corresponding crate. 
+  */
   builtRustCratesWithFeatures =
     { packageId
     , features
     , crateConfigs ? crates
-    , crateOverrides
     , buildRustCrateFunc
     , runTests
     , target ? defaultTarget

diff --git a/sample_projects/bin_with_git_branch_dep/Cargo.nix b/sample_projects/bin_with_git_branch_dep/Cargo.nix
@@ -217,12 +217,18 @@ rec {
         }
       );
 
-  /* A restricted overridable version of buildRustCrateWithFeaturesImpl. */
+  /* A restricted overridable version of builtRustCratesWithFeatures. */
   buildRustCrateWithFeatures =
     { packageId
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
-    , buildRustCrateFunc ? buildRustCrate
+    , buildRustCrateFunc ? (
+        if crateOverrides == pkgs.defaultCrateOverrides
+        then buildRustCrate
+        else buildRustCrate.override {
+          defaultCrateOverrides = crateOverrides;
+        }
+      )
     , runTests ? false
     , testCrateFlags ? []
     }:
@@ -231,11 +237,11 @@ rec {
           { features, crateOverrides, runTests, testCrateFlags }:
             let
               builtRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = false;
               };
               builtTestRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = true;
               };
               drv = builtRustCrates.${packageId};
@@ -245,12 +251,13 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags; };
 
-  /* Returns a buildRustCrate derivation for the given packageId and features. */
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
+     for the corresponding crate. 
+  */
   builtRustCratesWithFeatures =
     { packageId
     , features
     , crateConfigs ? crates
-    , crateOverrides
     , buildRustCrateFunc
     , runTests
     , target ? defaultTarget

diff --git a/sample_projects/bin_with_git_submodule_dep/Cargo.nix b/sample_projects/bin_with_git_submodule_dep/Cargo.nix
@@ -1391,12 +1391,18 @@ rec {
         }
       );
 
-  /* A restricted overridable version of buildRustCrateWithFeaturesImpl. */
+  /* A restricted overridable version of builtRustCratesWithFeatures. */
   buildRustCrateWithFeatures =
     { packageId
     , features ? rootFeatures
     , crateOverrides ? defaultCrateOverrides
-    , buildRustCrateFunc ? buildRustCrate
+    , buildRustCrateFunc ? (
+        if crateOverrides == pkgs.defaultCrateOverrides
+        then buildRustCrate
+        else buildRustCrate.override {
+          defaultCrateOverrides = crateOverrides;
+        }
+      )
     , runTests ? false
     , testCrateFlags ? []
     }:
@@ -1405,11 +1411,11 @@ rec {
           { features, crateOverrides, runTests, testCrateFlags }:
             let
               builtRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = false;
               };
               builtTestRustCrates = builtRustCratesWithFeatures {
-                inherit packageId features crateOverrides buildRustCrateFunc;
+                inherit packageId features buildRustCrateFunc;
                 runTests = true;
               };
               drv = builtRustCrates.${packageId};
@@ -1419,12 +1425,13 @@ rec {
         )
         { inherit features crateOverrides runTests testCrateFlags; };
 
-  /* Returns a buildRustCrate derivation for the given packageId and features. */
+  /* Returns an attr set with packageId mapped to the result of buildRustCrateFunc 
+     for the corresponding crate. 
+  */
   builtRustCratesWithFeatures =
     { packageId
     , features
     , crateConfigs ? crates
-    , crateOverrides
     , buildRustCrateFunc
     , runTests
     , target ? defaultTarget

diff --git a/sample_projects/bin_with_git_submodule_dep/default-with-customBuildRustCrate.nix b/sample_projects/bin_with_git_submodule_dep/default-with-customBuildRustCrate.nix
@@ -0,0 +1,19 @@
+{ pkgs ? import ../../nixpkgs.nix { config = {}; }
+, generatedCargoNix ? ./Cargo.nix
+}:
+
+let
+  customBuildRustCrate = pkgs.buildRustCrate.override {
+    defaultCrateOverrides = pkgs.defaultCrateOverrides // {
+      librocksdb-sys = attrs: with pkgs; {
+        src = attrs.src + "/librocksdb-sys";
+        buildInputs = [ clang rocksdb ];
+        LIBCLANG_PATH = "${clang.cc.lib}/lib";
+        ROCKSDB_LIB_DIR = "${rocksdb}/lib/";
+      };
+    };
+  };
+  basePackage = pkgs.callPackage generatedCargoNix { buildRustCrate = customBuildRustCrate; };
+  submodulePackage = basePackage.rootCrate.build;
+in
+submodulePackage
diff --git a/sample_projects/bin_with_git_submodule_dep/default.nix b/sample_projects/bin_with_git_submodule_dep/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  customBuildRustCrate = pkgs.buildRustCrate.override {
+  basePackage = pkgs.callPackage generatedCargoNix {
     defaultCrateOverrides = pkgs.defaultCrateOverrides // {
       librocksdb-sys = attrs: with pkgs; {
         src = attrs.src + "/librocksdb-sys";
@@ -13,7 +13,6 @@ let
       };
     };
   };
-  basePackage = pkgs.callPackage generatedCargoNix { buildRustCrate = customBuildRustCrate; };
   submodulePackage = basePackage.rootCrate.build;
 in
 submodulePackage
diff --git a/tests.nix b/tests.nix
@@ -216,6 +216,14 @@ let
       expectedOutput = "Hello world from with_git_submodule_dep!";
     }
 
+    {
+      name = "bin_with_git_submodule_dep_customBuildRustCrate";
+      src = ./sample_projects/bin_with_git_submodule_dep;
+      pregeneratedBuild = "sample_projects/bin_with_git_submodule_dep/Cargo.nix";
+      customBuild = "sample_projects/bin_with_git_submodule_dep/default-with-customBuildRustCrate.nix";
+      expectedOutput = "Hello world from with_git_submodule_dep!";
+    }
+
     {
       name = "cdylib";
       src = ./sample_projects/cdylib;