From a2ea35a30c7e111a7352c5e2deda88a815ed5cd8 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 12 Jul 2026 17:17:15 +0100 Subject: [PATCH] dxmt: drop --- pkgs/by-name/dx/dxmt/package.nix | 132 ---------------------------- pkgs/by-name/dx/dxmt/winecrt0.patch | 33 ------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 165 deletions(-) delete mode 100644 pkgs/by-name/dx/dxmt/package.nix delete mode 100644 pkgs/by-name/dx/dxmt/winecrt0.patch diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix deleted file mode 100644 index 37cea9f27d7a..000000000000 --- a/pkgs/by-name/dx/dxmt/package.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - lib, - stdenv, - pkgsCross, - fetchFromGitHub, - buildPackages, - cmake, - git, - python3, - meson, - ninja, - tinyxxd, - sqlite, - libz, - ncurses, - libxml2, - wine64, - darwin, - symlinkJoin, -}: -let - dxmt-llvm = stdenv.mkDerivation rec { - pname = "dxmt-llvm"; - version = "15.0.7"; - - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - tag = version; - hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; - }; - - nativeBuildInputs = [ - cmake - git - ninja - python3 - ]; - - cmakeFlags = [ - "-DLLVM_ENABLE_ZSTD=OFF" - "-DLLVM_BUILD_TOOLS=Off" - "-S ../llvm" - ]; - }; - inherit (darwin) xcode; - - dxmt = pkgsCross.mingwW64.stdenv.mkDerivation (finalAttrs: { - pname = "dxmt"; - version = "0.80"; - - src = fetchFromGitHub { - owner = "3shain"; - repo = "dxmt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-HNSKqEYu8se8DyzwRbqfmHRRyBXyW6D5ddPaEdnkuL4="; - fetchSubmodules = true; - }; - - patches = [ - ./winecrt0.patch - ]; - - postPatch = '' - substituteInPlace src/airconv/darwin/meson.build --replace-fail -lcurses -lncurses - - sed -e "/find_program('xcrun')/d" \ - -e "s,metalir_generator = generator(xcrun,metalir_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal')," \ - -e "s,metallib_generator = generator(xcrun,metallib_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib')," \ - -e "s/'-sdk', 'macosx', 'metal\(lib\)\{0,1\}', //" \ - -i meson.build - ''; - - nativeBuildInputs = [ - meson - ninja - tinyxxd - buildPackages.stdenv.cc - ]; - - buildInputs = [ - sqlite - libz - ncurses - libxml2 - ]; - - mesonFlags = [ - (lib.mesonOption "native_llvm_path" "${dxmt-llvm}") - (lib.mesonOption "wine_install_path" "${wine64}") - ]; - - preBuild = '' - export HOME=$TMPDIR - ''; - - __structuredAttrs = true; - strictDeps = true; - - meta = { - description = "Metal-based translation layer for Direct3D 10/11"; - homepage = "https://github.com/3shain/dxmt"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.feyorsh ]; - platforms = lib.platforms.windows; - hydraPlatforms = [ ]; - }; - }); -in -symlinkJoin { - name = "dxmt-${dxmt.version}"; - - paths = [ dxmt ]; - - passthru = { - inherit dxmt; - }; - - __structuredAttrs = true; - strictDeps = true; - - meta = { - inherit (dxmt.meta) - description - homepage - maintainers - license - ; - platforms = [ ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/by-name/dx/dxmt/winecrt0.patch b/pkgs/by-name/dx/dxmt/winecrt0.patch deleted file mode 100644 index f4d0830659bb..000000000000 --- a/pkgs/by-name/dx/dxmt/winecrt0.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git c/src/winemetal/meson.build i/src/winemetal/meson.build -index 858d4b3..d937e29 100644 ---- c/src/winemetal/meson.build -+++ i/src/winemetal/meson.build -@@ -26,8 +26,19 @@ elif wine_install_path != '' - if not wine_install_path.startswith('/') - wine_install_path = join_paths(meson.project_source_root(), wine_install_path) - endif -- lib_winecrt0 = cc.find_library('winecrt0', dirs : [ join_paths(wine_install_path,'lib/wine', windows_builtin_install_dir) ]) -- lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)], static: true) -+ winecrt0_unix_archive = custom_target( -+ 'winecrt0_fixup', -+ output : 'libwinecrt0_fixed.a', -+ command : [ -+ 'sh', '-c', -+ 'ar p "$1" unix_lib.o > unix_lib.o && ar crs "$2" unix_lib.o', -+ 'sh', -+ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir, 'libwinecrt0.a'), -+ '@OUTPUT@', -+ ], -+ ) -+ lib_winecrt0 = declare_dependency(sources : winecrt0_unix_archive) -+ lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)]) - lib_dbghelp = cc.find_library('dbghelp', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir) ]) - winebuild = join_paths(wine_install_path, 'bin/winebuild') - else -@@ -59,4 +70,4 @@ custom_target('postprocess_lib', - - if cpu_family == 'x86_64' or cpu_family == 'aarch64' - subdir('unix') --endif -\ No newline at end of file -+endif diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6137765b0823..a66e87965800 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -688,6 +688,7 @@ mapAliases { dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14 dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27 dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13 + dxmt = throw "dxmt has been removed as it only supported x86_64-darwin"; # Added 2026-07-12 e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15 e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26