Skip to content

Comments

staging-next 2023-06-23#239304

Merged
vcunat merged 234 commits intomasterfrom
staging-next
Jun 26, 2023
Merged

staging-next 2023-06-23#239304
vcunat merged 234 commits intomasterfrom
staging-next

Conversation

markuskowa and others added 30 commits May 16, 2023 13:12
The updated Darwin stdenv uses `llvm-strip`, but that causes issues for
rav1e when using NASM and linking it with the cctools ld64. Stripping
the debug information instead of everything fixes the problem.
Without the change `llvm` build fails on `gcc-13` fails as:

    [  0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o
    In file included from llvm/lib/Support/Signals.cpp:14:
    llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void
      119 |   void CleanupOnSignal(uintptr_t Context);
          |        ^~~~~~~~~~~~~~~
gst-plugins-bad is used by a lot of packages, and opencv has `enableCuda` option. Forcing people to only use opencv when necessary reduces rebuild size when `config.cudaSupport = true`
gnu-efi> /build/gnu-efi-3.0.17//lib/console.c:84:68: error: passing argument 2 of ‘ConOut->OutputString’ from incompatible pointer type [8;;h
ttps://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
gnu-efi>    84 |                 uefi_call_wrapper(ConOut->OutputString, 2, ConOut, L"\b \b");
gnu-efi>       |                                                                    ^~~~~~~~
gnu-efi>       |                                                                    |
gnu-efi>       |                                                                    short unsigned int *
The current version of the derivation builds in shared libraries mode,
but then the "shared" flag is not passed to the "make install"
invocation. This causes "make install" to perform a whole second build
from scratch, in static mode, and install this to $out instead.

Instead pass shared=yes as part of the makeFlags -- this is basically
the only thing that the "shared" build target does anyway, and I don't
think there is a similar target for "make install".

This issue was detected because the .pc shipped with mupdf doesn't work
with the static libraries currently shipped (it doesn't include
recursive dependencies like zlib).
This can result in swift-corefoundation being included even when a
derivation uses `apple_sdk_11_0.stdenv` directly, which may result in
hard to debug compiler errors (unless you just happen to know cryptic
compiler errors means the 10.12 and 11.0 SDKs have been mixed).
When `--add-flags` is not used, `flagsBefore` is unset.  This causes an error when invoking `makeWrapper` from a context that sets `-o nounset`, as is done in `buildDotnetModule`.
This change makes `makeWrapper` safe for use in these conditions.
Many dependents only require getent and not all the locale generation
tools that are included in the `bin` output. This can save some
closure size!
apple_sdk_11_0.stdenv: replace extraBuildInputs with CF from 11.0 SDK
mupdf: actually build and install the shared libraries version
Some of the headers are symlinked to the root `include` in upstream
Libsystem, so also symlink them there from `include/pthread`.
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Jun 25, 2023
@vcunat
Copy link
Member Author

vcunat commented Jun 26, 2023

Not blockers for merging:

@vcunat vcunat merged commit 90de72a into master Jun 26, 2023
@wineee wineee mentioned this pull request Jun 27, 2023
12 tasks
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Jun 28, 2023
@vcunat vcunat mentioned this pull request Jul 6, 2023
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.