···152 ] ++ optionals (useVaapi) [
153 # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
154 ./patches/vaapi-fix.patch
155- ] ++ optional stdenv.isAarch64 (fetchpatch {
156- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
157- postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
158- sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
159- });
160161 postPatch = ''
162 # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
···152 ] ++ optionals (useVaapi) [
153 # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
154 ./patches/vaapi-fix.patch
155+ ];
0000156157 postPatch = ''
158 # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
···4 local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
5 if [[ -f "$loadersCache" ]]; then
6 if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then
7- if [[ "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" ]]; then
8 export GDK_PIXBUF_MODULE_FILE="$loadersCache"
9 fi
10 else
···4 local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
5 if [[ -f "$loadersCache" ]]; then
6 if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then
7+ if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then
8 export GDK_PIXBUF_MODULE_FILE="$loadersCache"
9 fi
10 else
+3
pkgs/development/libraries/gegl/4.0.nix
···105 "-Dlibv4l=disabled"
106 "-Dlibv4l2=disabled"
107 "-Dumfpack=disabled"
000108 ];
109110 # TODO: Fix missing math symbols in gegl seamless clone.
···105 "-Dlibv4l=disabled"
106 "-Dlibv4l2=disabled"
107 "-Dumfpack=disabled"
108+ # Disabled due to multiple vulnerabilities, see
109+ # https://github.com/NixOS/nixpkgs/pull/73586
110+ "-Djasper=disabled"
111 ];
112113 # TODO: Fix missing math symbols in gegl seamless clone.
···1diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
2-index 9250016..91d54ec 100644
3--- a/cctools/ld64/src/ld/Options.cpp
4+++ b/cctools/ld64/src/ld/Options.cpp
5-@@ -4175,23 +4175,9 @@ void Options::checkIllegalOptionCombinations()
06 throw "-r and -dead_strip cannot be used together";
78- // can't use -rpath unless targeting 10.5 or later
9- if ( fRPaths.size() > 0 ) {
10-- if ( !minOS(ld::mac10_5, ld::iOS_2_0) )
11- throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
12- switch ( fOutputKind ) {
13- case Options::kDynamicExecutable:
···23- }
24- }
25-
26-+ if ( fRPaths.size() > 0 && !minOS(ld::mac10_5, ld::iOS_2_0) )
27-+ throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
28-+
29 if ( fPositionIndependentExecutable ) {
30 switch ( fOutputKind ) {
31 case Options::kDynamicExecutable:
···1diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
2+index e4b37ec..4189ebc 100644
3--- a/cctools/ld64/src/ld/Options.cpp
4+++ b/cctools/ld64/src/ld/Options.cpp
5+@@ -5800,24 +5800,6 @@ void Options::checkIllegalOptionCombinations()
6+ if ( fDeadStrip && (fOutputKind == Options::kObjectFile) )
7 throw "-r and -dead_strip cannot be used together";
89+- // can't use -rpath unless targeting 10.5 or later
10- if ( fRPaths.size() > 0 ) {
11+- if ( !platforms().minOS(ld::version2008) )
12- throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
13- switch ( fOutputKind ) {
14- case Options::kDynamicExecutable:
···24- }
25- }
26-
00027 if ( fPositionIndependentExecutable ) {
28 switch ( fOutputKind ) {
29 case Options::kDynamicExecutable:
+5-11
pkgs/os-specific/darwin/cctools/port.nix
···1819let
20 baseParams = rec {
21- name = "${targetPrefix}cctools-port-${version}";
22- version = "895";
2324 src = fetchFromGitHub {
25 owner = "tpoechtrager";
26 repo = "cctools-port";
27- rev = "07619027f8311fa61b4a549c75994b88739a82d8";
28- sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi";
29 };
3031 outputs = [ "out" "dev" ];
···35 ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
36 ++ stdenv.lib.optional enableTapiSupport libtapi;
3738- patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ./apfs.patch ];
3940 __propagatedImpureHostDeps = [
41 # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
···82 EOF
8384 cd cctools
85- '';
86-87- # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
88- # hairy to handle during bootstrap. Perhaps it could be optional?
89- preConfigure = ''
90- sh autogen.sh
91 '';
9293 preInstall = ''
···1819let
20 baseParams = rec {
21+ name = "${targetPrefix}cctools-port";
22+ version = "927.0.2";
2324 src = fetchFromGitHub {
25 owner = "tpoechtrager";
26 repo = "cctools-port";
27+ rev = "8239a5211bcf07d6b9d359782e1a889ec1d7cce5";
28+ sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac";
29 };
3031 outputs = [ "out" "dev" ];
···35 ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
36 ++ stdenv.lib.optional enableTapiSupport libtapi;
3738+ patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];
3940 __propagatedImpureHostDeps = [
41 # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
···82 EOF
8384 cd cctools
00000085 '';
8687 preInstall = ''