diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
| commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
| tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/build-support | |
| parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
| parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
| download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip | |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/build-support')
| -rw-r--r-- | nixpkgs/pkgs/build-support/build-bazel-package/default.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/pkgs/build-support/rust/default.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/nixpkgs/pkgs/build-support/build-bazel-package/default.nix index f39f4e65e454..b0840192ecec 100644 --- a/nixpkgs/pkgs/build-support/build-bazel-package/default.nix +++ b/nixpkgs/pkgs/build-support/build-bazel-package/default.nix @@ -50,6 +50,7 @@ in stdenv.mkDerivation (fBuildAttrs // { # Patching markers to make them deterministic sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker + sed -i '/^ENV:TMP.*/d' $bazelOut/external/\@*.marker # Remove all vcs files rm -rf $(find $bazelOut/external -type d -name .git) diff --git a/nixpkgs/pkgs/build-support/rust/default.nix b/nixpkgs/pkgs/build-support/rust/default.nix index 8610910d4453..92e312a6aed2 100644 --- a/nixpkgs/pkgs/build-support/rust/default.nix +++ b/nixpkgs/pkgs/build-support/rust/default.nix @@ -2,7 +2,8 @@ let buildRustPackage = - { name, cargoSha256 ? "unset" + { name ? "${args.pname}-${args.version}" + , cargoSha256 ? "unset" , src ? null , srcs ? null , cargoPatches ? [] |