diff options
| author | figsoda <figsoda@pm.me> | 2021-11-15 19:46:47 -0500 |
|---|---|---|
| committer | figsoda <figsoda@pm.me> | 2021-11-16 08:11:53 -0500 |
| commit | fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f (patch) | |
| tree | ec05c689d40322bb879ecc3bcbeb6f24ab35cbb1 | |
| parent | bd60edf470b4a759e530778072b198ed2e3eab58 (diff) | |
| download | nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.tar nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.tar.gz nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.tar.bz2 nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.tar.lz nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.tar.xz nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.tar.zst nixpkgs-fdf41beab13b969e2feb18fd29a04bfa4c4f7a5f.zip | |
diesel-cli: use buildFeatures
| -rw-r--r-- | pkgs/development/tools/diesel-cli/default.nix | 9 |
1 files 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 '' |