diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2019-09-27 06:19:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 06:19:18 +0000 |
| commit | ad773d31e210e4828a40e0b6d2a191592a29451a (patch) | |
| tree | a5bbff9d564d55d2417c6319e3cdae3d1b8b0970 /pkgs/build-support/rust | |
| parent | 4ca445c722d283c7cc11dfeb0e50e2d490a3515b (diff) | |
| parent | bad07dfac57c36dff1c7b3fd4020fea806d7be93 (diff) | |
| download | nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.gz nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.bz2 nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.lz nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.xz nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.tar.zst nixpkgs-ad773d31e210e4828a40e0b6d2a191592a29451a.zip | |
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 2a40240671c..2c7226b0962 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -21,7 +21,7 @@ , workspace_member }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; - version = lib.splitString "." (lib.head version_); + version = lib.splitVersion (lib.head version_); rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); @@ -150,4 +150,3 @@ in '' fi runHook postConfigure '' - |