treewide: Remove use of apple_sdk framework stub paths (#399040)

+7 -16

pkgs/by-name/gi/gildas/package.nix

··· 12 12 perl, 13 13 groff, 14 14 which, 15 - darwin, 16 15 ncurses, 17 16 }: 18 17 ··· 48 49 which 49 50 ]; 50 51 51 - buildInputs = 52 - [ 53 - gtk2-x11 54 - lesstif 55 - cfitsio 56 - python3Env 57 - ncurses 58 - ] 59 - ++ lib.optionals stdenv.hostPlatform.isDarwin ( 60 - with darwin.apple_sdk.frameworks; [ CoreFoundation ] 61 - ); 52 + buildInputs = [ 53 + gtk2-x11 54 + lesstif 55 + cfitsio 56 + python3Env 57 + ncurses 58 + ]; 62 59 63 60 patches = 64 61 [ ./wrapper.patch ] ··· 67 72 68 73 # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 69 74 env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; 70 - 71 - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin ( 72 - with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks" 73 - ); 74 75 75 76 configurePhase = '' 76 77 substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out

+23

pkgs/by-name/od/odin/darwin-remove-impure-links.patch

··· 1 + diff --git a/src/linker.cpp b/src/linker.cpp 2 + index ec165ef7d..91a28b8fc 100644 3 + --- a/src/linker.cpp 4 + +++ b/src/linker.cpp 5 + @@ -769,18 +769,6 @@ try_cross_linking:; 6 + gbString platform_lib_str = gb_string_make(heap_allocator(), ""); 7 + defer (gb_string_free(platform_lib_str)); 8 + if (build_context.metrics.os == TargetOs_darwin) { 9 + - platform_lib_str = gb_string_appendc(platform_lib_str, "-Wl,-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib "); 10 + - 11 + - // Homebrew's default library path, checking if it exists to avoid linking warnings. 12 + - if (gb_file_exists("/opt/homebrew/lib")) { 13 + - platform_lib_str = gb_string_appendc(platform_lib_str, "-L/opt/homebrew/lib "); 14 + - } 15 + - 16 + - // MacPort's default library path, checking if it exists to avoid linking warnings. 17 + - if (gb_file_exists("/opt/local/lib")) { 18 + - platform_lib_str = gb_string_appendc(platform_lib_str, "-L/opt/local/lib "); 19 + - } 20 + - 21 + // Only specify this flag if the user has given a minimum version to target. 22 + // This will cause warnings to show up for mismatched libraries. 23 + if (build_context.minimum_os_version_string_given) {

+3 -18

pkgs/by-name/od/odin/package.nix

··· 1 1 { 2 2 fetchFromGitHub, 3 3 lib, 4 - libiconv, 5 4 llvmPackages, 6 - MacOSX-SDK, 7 5 makeBinaryWrapper, 8 6 nix-update-script, 9 - Security, 10 7 which, 11 8 }: 12 9 ··· 21 24 hash = "sha256-GXea4+OIFyAhTqmDh2q+ewTUqI92ikOsa2s83UH2r58="; 22 25 }; 23 26 24 - postPatch = 25 - lib.optionalString stdenv.hostPlatform.isDarwin '' 26 - substituteInPlace src/linker.cpp \ 27 - --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} 28 - '' 29 - + '' 30 - substituteInPlace build_odin.sh \ 31 - --replace-fail '-framework System' '-lSystem' 32 - patchShebangs build_odin.sh 33 - ''; 27 + patches = [ 28 + ./darwin-remove-impure-links.patch 29 + ]; 34 30 35 31 LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; 36 32 ··· 34 44 nativeBuildInputs = [ 35 45 makeBinaryWrapper 36 46 which 37 - ]; 38 - 39 - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ 40 - libiconv 41 - Security 42 47 ]; 43 48 44 49 installPhase = ''

+23 -38

pkgs/by-name/op/opensc/package.nix

··· 14 14 docbook_xsl, 15 15 libxslt, 16 16 docbook_xml_dtd_412, 17 - darwin, 18 17 nix-update-script, 19 - withApplePCSC ? stdenv.hostPlatform.isDarwin, 20 18 }: 21 19 22 20 stdenv.mkDerivation rec { ··· 33 35 autoreconfHook 34 36 libxslt # xsltproc 35 37 ]; 36 - buildInputs = 37 - [ 38 - zlib 39 - readline 40 - openssl 41 - libassuan 42 - libXt 43 - libiconv 44 - docbook_xml_dtd_412 45 - ] 46 - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Carbon 47 - ++ (if withApplePCSC then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]); 38 + buildInputs = [ 39 + zlib 40 + readline 41 + openssl 42 + libassuan 43 + libXt 44 + libiconv 45 + docbook_xml_dtd_412 46 + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) pcsclite; 48 47 49 48 env.NIX_CFLAGS_COMPILE = "-Wno-error"; 50 49 51 - configureFlags = [ 52 - "--enable-zlib" 53 - "--enable-readline" 54 - "--enable-openssl" 55 - "--enable-pcsc" 56 - "--enable-sm" 57 - "--enable-man" 58 - "--enable-doc" 59 - "--localstatedir=/var" 60 - "--sysconfdir=/etc" 61 - "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" 62 - "--with-pcsc-provider=${ 63 - if withApplePCSC then 64 - "${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/PCSC" 65 - else 66 - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" 67 - }" 68 - ]; 69 - 70 - PCSC_CFLAGS = lib.concatStringsSep " " ( 71 - lib.optionals withApplePCSC [ 72 - "-I${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/Headers" 73 - "-I${lib.getDev pcsclite}/include/PCSC" 50 + configureFlags = 51 + [ 52 + "--enable-zlib" 53 + "--enable-readline" 54 + "--enable-openssl" 55 + "--enable-pcsc" 56 + "--enable-sm" 57 + "--enable-man" 58 + "--enable-doc" 59 + "--localstatedir=/var" 60 + "--sysconfdir=/etc" 61 + "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" 74 62 ] 75 - ); 63 + ++ lib.optional (!stdenv.hostPlatform.isDarwin) 64 + "--with-pcsc-provider=${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"; 76 65 77 66 installFlags = [ 78 67 "sysconfdir=$(out)/etc"

+9 -26

pkgs/development/libraries/bullet/default.nix

··· 6 6 libGLU, 7 7 libGL, 8 8 libglut, 9 - Cocoa, 10 - OpenGL, 11 9 }: 12 10 13 11 stdenv.mkDerivation rec { ··· 20 22 }; 21 23 22 24 nativeBuildInputs = [ cmake ]; 23 - buildInputs = 24 - lib.optionals stdenv.hostPlatform.isLinux [ 25 - libGLU 26 - libGL 27 - libglut 28 - ] 29 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 30 - Cocoa 31 - OpenGL 32 - ]; 25 + buildInputs = [ 26 + libGLU 27 + libGL 28 + libglut 29 + ]; 33 30 34 - postPatch = 35 - '' 36 - substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ 37 - --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" 38 - '' 39 - + lib.optionalString stdenv.hostPlatform.isDarwin '' 40 - sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt 41 - sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt 42 - ''; 31 + postPatch = '' 32 + substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \ 33 + --replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing" 34 + ''; 43 35 44 36 cmakeFlags = 45 37 [ ··· 38 50 "-DINSTALL_EXTRA_LIBS=ON" 39 51 ] 40 52 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 41 - "-DOPENGL_FOUND=true" 42 - "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" 43 - "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" 44 - "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework" 45 - "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" 46 53 "-DBUILD_BULLET2_DEMOS=OFF" 47 54 "-DBUILD_UNIT_TESTS=OFF" 48 55 "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF"

+5 -22

pkgs/development/libraries/bullet/roboschool-fork.nix

··· 6 6 libGLU, 7 7 libGL, 8 8 libglut, 9 - Cocoa, 10 - OpenGL, 11 9 }: 12 10 13 11 stdenv.mkDerivation { ··· 24 26 }; 25 27 26 28 nativeBuildInputs = [ cmake ]; 27 - buildInputs = 28 - lib.optionals stdenv.hostPlatform.isLinux [ 29 - libGLU 30 - libGL 31 - libglut 32 - ] 33 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 34 - Cocoa 35 - OpenGL 36 - ]; 29 + buildInputs = [ 30 + libGLU 31 + libGL 32 + libglut 33 + ]; 37 34 38 35 patches = [ ./gwen-narrowing.patch ]; 39 - 40 - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' 41 - sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt 42 - sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt 43 - ''; 44 36 45 37 cmakeFlags = 46 38 [ ··· 39 51 "-DINSTALL_EXTRA_LIBS=ON" 40 52 ] 41 53 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 42 - "-DOPENGL_FOUND=true" 43 - "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" 44 - "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" 45 - "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework" 46 - "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" 47 54 "-DBUILD_BULLET2_DEMOS=OFF" 48 55 "-DBUILD_UNIT_TESTS=OFF" 49 56 ];

+1 -19

pkgs/development/libraries/libsamplerate/default.nix

··· 4 4 fetchurl, 5 5 pkg-config, 6 6 libsndfile, 7 - ApplicationServices, 8 - Carbon, 9 - CoreServices, 10 7 }: 11 8 12 - let 13 - inherit (lib) optionals optionalString; 14 - 15 - in 16 9 stdenv.mkDerivation rec { 17 10 pname = "libsamplerate"; 18 11 version = "0.2.2"; ··· 16 23 }; 17 24 18 25 nativeBuildInputs = [ pkg-config ]; 19 - buildInputs = 20 - [ libsndfile ] 21 - ++ optionals stdenv.hostPlatform.isDarwin [ 22 - ApplicationServices 23 - CoreServices 24 - ]; 26 + buildInputs = [ libsndfile ]; 25 27 26 28 configureFlags = [ "--disable-fftw" ]; 27 29 ··· 24 36 "dev" 25 37 "out" 26 38 ]; 27 - 28 - postConfigure = optionalString stdenv.hostPlatform.isDarwin '' 29 - # need headers from the Carbon.framework in /System/Library/Frameworks to 30 - # compile this on darwin -- not sure how to handle 31 - NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers" 32 - ''; 33 39 34 40 meta = with lib; { 35 41 description = "Sample Rate Converter for audio";

+6 -20

pkgs/development/libraries/netcdf-fortran/default.nix

··· 6 6 hdf5, 7 7 curl, 8 8 gfortran, 9 - CoreFoundation, 10 - CoreServices, 11 - SystemConfiguration, 12 9 }: 13 10 stdenv.mkDerivation rec { 14 11 pname = "netcdf-fortran"; ··· 19 22 }; 20 23 21 24 nativeBuildInputs = [ gfortran ]; 22 - buildInputs = 23 - [ 24 - netcdf 25 - hdf5 26 - curl 27 - ] 28 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 29 - CoreFoundation 30 - CoreServices 31 - SystemConfiguration 32 - ]; 33 - env.NIX_LDFLAGS = toString ( 34 - lib.optionals stdenv.hostPlatform.isDarwin [ 35 - "-F${CoreServices}/Library/Frameworks" 36 - "-F${SystemConfiguration}/Library/Frameworks" 37 - ] 38 - ); 25 + buildInputs = [ 26 + netcdf 27 + hdf5 28 + curl 29 + ]; 30 + 39 31 doCheck = true; 40 32 41 33 FFLAGS = [ "-std=legacy" ];

+1 -4

pkgs/development/python-modules/jaxlib/default.nix

··· 15 15 cython, 16 16 fetchFromGitHub, 17 17 git, 18 - darwin, 19 18 jsoncpp, 20 19 nsync, 21 20 openssl, ··· 408 409 ); 409 410 410 411 # Note: we cannot do most of this patching at `patch` phase as the deps 411 - # are not available yet. Framework search paths aren't added by bintools 412 - # hook. See https://github.com/NixOS/nixpkgs/pull/41914. 412 + # are not available yet. 413 413 preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' 414 - export NIX_LDFLAGS+=" -F${darwin.apple_sdk.frameworks.IOKit}/Library/Frameworks" 415 414 substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ 416 415 --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" 417 416 substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \

+8 -23

pkgs/development/python-modules/pyscard/default.nix

··· 2 2 lib, 3 3 buildPythonPackage, 4 4 fetchFromGitHub, 5 - PCSC, 6 5 pcsclite, 7 6 pkg-config, 8 7 pytestCheckHook, ··· 9 10 stdenv, 10 11 swig, 11 12 }: 12 - 13 - let 14 - # Package does not support configuring the pcsc library. 15 - withApplePCSC = stdenv.hostPlatform.isDarwin; 16 - in 17 13 18 14 buildPythonPackage rec { 19 15 pname = "pyscard"; ··· 24 30 25 31 build-system = [ setuptools ]; 26 32 27 - nativeBuildInputs = [ swig ] ++ lib.optionals (!withApplePCSC) [ pkg-config ]; 33 + nativeBuildInputs = [ swig ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; 28 34 29 - buildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; 35 + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pcsclite ]; 30 36 31 37 nativeCheckInputs = [ pytestCheckHook ]; 32 38 ··· 35 41 substituteInPlace pyproject.toml \ 36 42 --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' 37 43 '' 38 - + ( 39 - if withApplePCSC then 40 - '' 41 - substituteInPlace src/smartcard/scard/winscarddll.c \ 42 - --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ 43 - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" 44 - '' 45 - else 46 - '' 47 - substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" 48 - substituteInPlace src/smartcard/scard/winscarddll.c \ 49 - --replace-fail "libpcsclite.so.1" \ 50 - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" 51 - '' 52 - ); 44 + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 45 + substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" 46 + substituteInPlace src/smartcard/scard/winscarddll.c \ 47 + --replace-fail "libpcsclite.so.1" \ 48 + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" 49 + ''; 53 50 54 51 meta = { 55 52 description = "Smartcard library for python";

-6

pkgs/development/tools/build-managers/bazel/cpp-test.nix

··· 10 10 runLocal, 11 11 runtimeShell, 12 12 writeScript, 13 - writeText, 14 13 distDir, 15 - Foundation ? null, 16 14 }: 17 15 18 16 let ··· 56 58 + lib.optionalString (stdenv.hostPlatform.isDarwin) '' 57 59 --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ 58 60 --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ 59 - '' 60 - + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) '' 61 - --linkopt=-Wl,-F${Foundation}/Library/Frameworks \ 62 - --linkopt=-L${darwin.libobjc}/lib \ 63 61 ''; 64 62 }; 65 63

+6 -17

pkgs/servers/x11/xorg/overrides.nix

··· 48 48 libxslt, 49 49 libxcrypt, 50 50 hwdata, 51 - ApplicationServices, 52 - Carbon, 53 - Cocoa, 54 - Xplugin, 55 51 xorg, 56 52 windows, 57 53 libgbm, ··· 1216 1220 bootstrap_cmds 1217 1221 automake 1218 1222 autoconf 1219 - Xplugin 1220 - Carbon 1221 - Cocoa 1222 1223 mesa 1223 1224 ]; 1224 1225 propagatedBuildInputs = commonPropagatedBuildInputs ++ [ ··· 1274 1281 preConfigure = '' 1275 1282 mkdir -p $out/Applications 1276 1283 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" 1277 - substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${ApplicationServices} 1278 1284 ''; 1279 1285 postInstall = '' 1280 1286 rm -fr $out/share/X11/xkb/compiled ··· 1314 1322 "--without-dtrace" 1315 1323 ]; 1316 1324 1317 - buildInputs = 1318 - old.buildInputs 1319 - ++ [ 1320 - xorg.pixman 1321 - xorg.libXfont2 1322 - xorg.xtrans 1323 - xorg.libxcvt 1324 - ] 1325 - ++ lib.optional stdenv.hostPlatform.isDarwin [ Xplugin ]; 1325 + buildInputs = old.buildInputs ++ [ 1326 + xorg.pixman 1327 + xorg.libXfont2 1328 + xorg.xtrans 1329 + xorg.libxcvt 1330 + ]; 1326 1331 }); 1327 1332 1328 1333 lndir = super.lndir.overrideAttrs (attrs: {

+4 -16

pkgs/top-level/all-packages.nix

··· 4455 4455 hdf5 = hdf5-mpi.override { usev110Api = true; }; 4456 4456 }; 4457 4457 4458 - netcdffortran = callPackage ../development/libraries/netcdf-fortran { 4459 - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; 4460 - }; 4458 + netcdffortran = callPackage ../development/libraries/netcdf-fortran { }; 4461 4459 4462 4460 inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7; 4463 4461 ··· 10153 10155 memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; 10154 10156 }; 10155 10157 10156 - libsamplerate = callPackage ../development/libraries/libsamplerate { 10157 - inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; 10158 - }; 10158 + libsamplerate = callPackage ../development/libraries/libsamplerate { }; 10159 10159 10160 10160 # GNU libc provides libiconv so systems with glibc don't need to 10161 10161 # build libiconv separately. Additionally, Apple forked/repackaged ··· 12598 12602 # so as not to have the newly bound xorg items already in scope, which would 12599 12603 # have created a cycle. 12600 12604 overrides = lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { 12601 - inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; 12602 - inherit (darwin.apple_sdk.libs) Xplugin; 12603 12605 inherit (buildPackages.darwin) bootstrap_cmds; 12604 12606 udev = if stdenv.hostPlatform.isLinux then udev else null; 12605 12607 libdrm = if stdenv.hostPlatform.isLinux then libdrm else null; ··· 13037 13043 }; 13038 13044 13039 13045 odin = callPackage ../by-name/od/odin/package.nix { 13040 - inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; 13041 - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; 13042 13046 llvmPackages = llvmPackages_18; 13043 13047 }; 13044 13048 ··· 19200 19208 19201 19209 zncModules = recurseIntoAttrs (callPackage ../applications/networking/znc/modules.nix { }); 19202 19210 19203 - bullet = callPackage ../development/libraries/bullet { 19204 - inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; 19205 - }; 19211 + bullet = callPackage ../development/libraries/bullet { }; 19206 19212 19207 - bullet-roboschool = callPackage ../development/libraries/bullet/roboschool-fork.nix { 19208 - inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; 19209 - }; 19213 + bullet-roboschool = callPackage ../development/libraries/bullet/roboschool-fork.nix { }; 19210 19214 19211 19215 dart = callPackage ../development/compilers/dart { }; 19212 19216

+1 -3

pkgs/top-level/python-packages.nix

··· 13208 13208 13209 13209 pyscaffoldext-travis = callPackage ../development/python-modules/pyscaffoldext-travis { }; 13210 13210 13211 - pyscard = callPackage ../development/python-modules/pyscard { 13212 - inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; 13213 - }; 13211 + pyscard = callPackage ../development/python-modules/pyscard { }; 13214 13212 13215 13213 pyscf = callPackage ../development/python-modules/pyscf { }; 13216 13214