staging-next 2023-05-25 #233944
Merged
staging-next 2023-05-25 #233944
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was causing some regions to escape the fixupHook. As a concrete example, pkgconf's signature on aarch64-darwin was not valid because the library was not fixed up.
The NIX_LIB64|32_IN_SELF_RPATH environment variables control whether to add lib64 and lib32 to rpaths. However, they're set depending on the build paltform, not the target platform and thus their values are incorrect for for cross-builds. On the other hand, setting them according to the build platform introduce pointless differences in build outputs; see #221350 for details. This change fixes the issues by boldly removes the NIX_LIB*_IN_SELF_RPATH facility altogether, in the hope that it is no longer necessary. They were introduced in 2009, long before nixpkgs had good support for cross-builds. Fixes #221350
from 6.0 branch
At present, there are two blockers from using webrtc with the gstreamer included by Nix. The first is that on Darwin, the explicit WebRTC functionality is disabled, because at time of adding, libnice did not work on Darwin. libnice does now work on darwin, so we can re-enable it. The second is that webrtc also needs sctp, which is provided by usrsctp. This was disabled at authorship time because there was no nix derivation. There now is, so it can be safely enabled.
The main change is drop of the upstream patch that fixes parallel build failures. Changes: https://lists.nongnu.org/archive/html/m17n-list/2023-05/msg00002.html
Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output. Otherwise it breaks `plasma5Packages.kio-extras`: https://hydra.nixos.org/build/221540008/nixlog/3/tail
...into staging-next
The split was merged in cfe0093 from PR #226315 This fixes qtractor build (and maybe others): https://hydra.nixos.org/build/221582472/nixlog/3/tail
...into staging-next
|
For reference, a channel-blocking regression got unnoticed until merge: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the first
staging-nextthat will not be present in 23.05.Helpful links
https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents
https://hydra.nixos.org/job/nixos/staging-next-small/tested
https://hydra.nixos.org/jobset/nixpkgs/staging-next
https://hydra.nixos.org/jobset/nixos/staging-next-small
Mass breakages
(will be edited based on progress)