nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 17:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustup-toolchain-install-master: fix build by using openssl 1.x

Browse Source 
Upstream package didn't have recent releases. Currently build fails with something like
```
  running: "/nix/store/dq0xwmsk1g0i2ayg6pb7y87na2knzylh-gcc-wrapper-11.3.0/bin/cc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "/nix/store/f95kxwhnr2bazy7nl6wzwjiak02dlp9v-openssl-3.0.7-dev/include" "-Wall" "-Wextra" "-E" "build/expando.c"
  cargo:warning=build/expando.c:4:24: error: pasting "RUST_VERSION_OPENSSL_" and "(" does not give a valid preprocessing token
  cargo:warning=    4 | #define VERSION2(n, v) RUST_VERSION_##n##_##v
  cargo:warning=      |                        ^~~~~~~~~~~~~
  cargo:warning=build/expando.c:5:23: note: in expansion of macro 'VERSION2'
  cargo:warning=    5 | #define VERSION(n, v) VERSION2(n, v)
  cargo:warning=      |                       ^~~~~~~~
  cargo:warning=build/expando.c:10:1: note: in expansion of macro 'VERSION'
  cargo:warning=   10 | VERSION(OPENSSL, OPENSSL_VERSION_NUMBER)
  cargo:warning=      | ^~~~~~~
  exit status: 1
```
which looks like https://github.com/sfackler/rust-openssl/issues/1030
and should be fixed in a transitive dependency by https://github.com/sfackler/rust-openssl/pull/1264

But rather than trying to bump transitive dependency let's downgrade
openssl used by this package.

ZHF: #199919
This commit is contained in:
Dmitry Ivankov 2022-11-15 23:51:29 +01:00
parent 506f41b6ad
commit 54d139174a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/all-packages.nix
View File

@ -15246,6 +15246,7 @@ with pkgs;
};
rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
rusty-man = callPackage ../development/tools/rust/rusty-man { };