From fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:46:47 -0500 Subject: [PATCH] diesel-cli: use buildFeatures --- pkgs/development/tools/diesel-cli/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 211993d2d7e..b964262f56c 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -21,9 +21,6 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq let inherit (lib) optional optionals optionalString; - features = optional sqliteSupport "sqlite" - ++ optional postgresqlSupport "postgres" - ++ optional mysqlSupport "mysql"; in rustPlatform.buildRustPackage rec { @@ -36,7 +33,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mRdDc4fHMkwkszY+2l8z1RSNMEQnrWI5/Y0Y2W+guQE="; }; - cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoSha256 = "sha256-sQ762Ss31sA5qALHzwkvwbfRXo00cCtqzQyoz3/zf6I="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -48,6 +44,11 @@ rustPlatform.buildRustPackage rec { ++ optional postgresqlSupport postgresql ++ optionals mysqlSupport [ mariadb zlib ]; + buildNoDefaultFeatures = true; + buildFeatures = optional sqliteSupport "sqlite" + ++ optional postgresqlSupport "postgres" + ++ optional mysqlSupport "mysql"; + checkPhase = '' runHook preCheck '' + optionalString sqliteSupport ''