diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 18:00:29 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 18:00:29 +0000 |
| commit | 747d5a3dbf1758ae4ef8037429337c029a9e76d0 (patch) | |
| tree | 74d385bb83ec4eeea936eb49aaee9ff22508430d /pkgs/build-support | |
| parent | 51991e960676f33303c41dfac0d5956bf7846b24 (diff) | |
| parent | 4a0a297861dad089c08373822c5fa28556a2a089 (diff) | |
| download | nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.tar nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.tar.gz nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.tar.bz2 nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.tar.lz nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.tar.xz nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.tar.zst nixlib-747d5a3dbf1758ae4ef8037429337c029a9e76d0.zip | |
Merge branch 'wrapper-pname-support-19.09' into wrapper-pname-support
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 3fcbe105c008..d987603a5fb2 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -34,7 +34,7 @@ let targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - bintoolsVersion = stdenv.lib.getVersion version; + bintoolsVersion = stdenv.lib.getVersion bintools; bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools); libc_bin = if libc == null then null else getBin libc; |