diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 10156450bec7e..2b1654b1d73a8 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation { glibc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Libsystem libxml2 ]; @@ -186,7 +185,6 @@ stdenv.mkDerivation { done # Patches for ovftool binary - change_args+=(-change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib) change_args+=(-change /usr/lib/libc++.1.dylib ${stdenv.cc.libcxx}/lib/libc++.1.dylib) change_args+=(-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib) change_args+=(-change /usr/lib/libxml2.2.dylib ${libxml2}/lib/libxml2.2.dylib) @@ -201,7 +199,7 @@ stdenv.mkDerivation { install_name_tool "''${change_args[@]}" "$out/libexec/ovftool" # Additional patches for ovftool dylibs - change_args+=(-change /usr/lib/libresolv.9.dylib ${darwin.Libsystem}/lib/libresolv.9.dylib) + change_args+=(-change /usr/lib/libresolv.9.dylib ${lib.getLib darwin.libresolv}/lib/libresolv.9.dylib) change_args+=(-change @loader_path/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib) change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index 8d1366db96518..ef70622303d3e 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -10,7 +10,6 @@ libuuid, libunwind, openssl, - darwin, lttng-ust, pam, testers, @@ -59,9 +58,6 @@ stdenv.mkDerivation rec { libunwind openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Libsystem - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust pam diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix index dcdceee7cd93e..0b69b4db9bd07 100644 --- a/pkgs/by-name/ps/psc-package/package.nix +++ b/pkgs/by-name/ps/psc-package/package.nix @@ -6,7 +6,6 @@ gmp, zlib, libiconv, - darwin, installShellFiles, }: @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ - -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ $PSC_PACKAGE '' diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index a78cd863dabda..e48107685d3e0 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -2,8 +2,10 @@ lib, stdenv, fetchFromGitHub, + apple-sdk_13, cmake, coreutils, + darwinMinVersionHook, libxml2, lto ? true, makeWrapper, @@ -17,7 +19,6 @@ which, z3, cctools, - darwin, }: stdenv.mkDerivation (rec { @@ -48,13 +49,20 @@ stdenv.mkDerivation (rec { hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; }; - nativeBuildInputs = [ - cmake - makeWrapper - which - python3 - git - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools ]; + nativeBuildInputs = + [ + cmake + makeWrapper + which + python3 + git + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Keep in sync with `PONY_OSX_PLATFORM`. + apple-sdk_13 + (darwinMinVersionHook "13.0") + cctools.libtool + ]; buildInputs = [ libxml2 @@ -68,7 +76,7 @@ stdenv.mkDerivation (rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (replaceVars ./fix-darwin-build.patch { - libSystem = darwin.Libsystem; + apple-sdk = apple-sdk_13; }) ]; diff --git a/pkgs/development/compilers/ponyc/fix-darwin-build.patch b/pkgs/development/compilers/ponyc/fix-darwin-build.patch index bca8f19d537d6..60446f73452ee 100644 --- a/pkgs/development/compilers/ponyc/fix-darwin-build.patch +++ b/pkgs/development/compilers/ponyc/fix-darwin-build.patch @@ -1,18 +1,13 @@ diff --git a/src/libponyc/codegen/genexe.c b/src/libponyc/codegen/genexe.c -index 9ae3ff16..fdfe2bc5 100644 +index 3f0348eaa1..76b03030bf 100644 --- a/src/libponyc/codegen/genexe.c +++ b/src/libponyc/codegen/genexe.c -@@ -296,10 +296,10 @@ static bool link_exe(compile_t* c, ast_t* program, - char* ld_cmd = (char*)ponyint_pool_alloc_size(ld_len); - +@@ -308,7 +308,7 @@ snprintf(ld_cmd, ld_len, -- "%s -execute -arch %.*s " -+ "%s -execute " + "%s -execute -arch %.*s " "-o %s %s %s %s " - "-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'", -- linker, (int)arch_len, c->opt->triple, file_exe, file_o, -+ "-L@libSystem@/lib -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'", -+ linker, file_exe, file_o, ++ "-L\"${SDKROOT:-${DEVELOPER_DIR:-@apple-sdk@}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk}/usr/lib\" -lSystem %s -platform_version macos '" STR(PONY_OSX_PLATFORM) "' '0.0.0'", + linker, (int)arch_len, c->opt->triple, file_exe, file_o, lib_args, ponyrt, sanitizer_arg ); - diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index cbd4168b60248..41c186050e349 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - Libsystem, }: let version = "110.99.7.1"; @@ -62,16 +61,10 @@ stdenv.mkDerivation { ./config/unpack $TMP runtime ''; - patchPhase = - '' - sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh - echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Locate standard headers like - substituteInPlace base/runtime/config/gen-posix-names.sh \ - --replace "\$SDK_PATH/usr" "${Libsystem}" - ''; + patchPhase = '' + sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh + echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl + ''; buildPhase = '' ./config/install.sh -default ${arch} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 707126c1a872a..3e265c8d15e25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6560,9 +6560,7 @@ with pkgs; }; # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; - smlnj = callPackage ../development/compilers/smlnj { - inherit (darwin) Libsystem; - }; + smlnj = callPackage ../development/compilers/smlnj { }; sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { };