diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-14 11:07:42 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-14 11:07:42 +0000 |
commit | ca4da963f85d08a249df63121f63c7a37b16ea18 (patch) | |
tree | d8d7171624db4c51c3d08214d3c3368c7558b207 /pkgs/development/compilers/gcc/10/default.nix | |
parent | 58857196f10eb0553ad00e10d7cc6340b92f5d3a (diff) | |
parent | f656c3e849f4eb1471aacf38607d7ed1ff9888e2 (diff) |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/audio/roc-toolkit/default.nix
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index afe58e51cdd30..7de8b14ac24ff 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -185,7 +185,7 @@ stdenv.mkDerivation ({ preConfigure = (import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; + inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; |