aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortilpner2021-06-12 21:41:34 +0200
committertilpner2021-06-12 21:41:34 +0200
commit0494c6341a9a34323bd68323a59c2152d4cc4a17 (patch)
tree21a1a9d39945e8d9d762654c6ebceb445ef2a4b7
parent26360abb9ba76f889442fa175109aa2e58cf52e6 (diff)
downloadrpb-s3-0494c6341a9a34323bd68323a59c2152d4cc4a17.tar.gz
rpb-s3-0494c6341a9a34323bd68323a59c2152d4cc4a17.tar.xz
rpb-s3-0494c6341a9a34323bd68323a59c2152d4cc4a17.zip
adapt to new crate2nix calling conventionHEADmaster
-rw-r--r--default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/default.nix b/default.nix
index 72b6ff2..d4555de 100644
--- a/default.nix
+++ b/default.nix
@@ -4,12 +4,18 @@
buildRustCrate ? pkgs.buildRustCrate }:
let
- overrides = defaultCrateOverrides // {
- };
- cargo = callPackage ./Cargo.nix {
- buildRustCrate = buildRustCrate.override {
- defaultCrateOverrides = overrides;
+ customBuildRustCrateForPkgs = pkgs: pkgs.buildRustCrate.override {
+ defaultCrateOverrides = defaultCrateOverrides // {
+ # leaving this dead override for future reference
+ # funky-things = attrs: {
+ # buildInputs = [ pkgs.openssl ];
+ # };
};
};
+
+ cargo = import ./Cargo.nix {
+ inherit pkgs;
+ buildRustCrateForPkgs = customBuildRustCrateForPkgs;
+ };
in cargo.rootCrate.build