From 91d5d4a920bcba12f09798c0c2dcfa8d77d3b060 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 19:39:33 +0200 Subject: [PATCH] x2t: move overrides to package.nix --- pkgs/by-name/x2/x2t/package.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/x2/x2t/package.nix index 9d619cdfd18e4..482c00705f1dd 100644 --- a/pkgs/by-name/x2/x2t/package.nix +++ b/pkgs/by-name/x2/x2t/package.nix @@ -16,7 +16,6 @@ jdk, lib, nodejs_22, - # needs to be static and built with MD2 support! openssl, pkg-config, python3, @@ -30,6 +29,11 @@ }: let + openssl' = openssl.override { + enableMD2 = true; + static = true; + }; + qmake = qt5.qmake; fixIcu = writeScript "fix-icu.sh" '' substituteInPlace \ @@ -722,9 +726,9 @@ let echo "== openssl ==" mkdir -p Common/3dParty/openssl/build/linux_64/lib - echo "Including openssl from ${openssl.dev}" - ln -s ${openssl.dev}/include Common/3dParty/openssl/build/linux_64/include - for i in ${openssl.out}/lib/*; do + echo "Including openssl from ${openssl'.dev}" + ln -s ${openssl'.dev}/include Common/3dParty/openssl/build/linux_64/include + for i in ${openssl'.out}/lib/*; do ln -s $i Common/3dParty/openssl/build/linux_64/lib/$(basename $i) done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa357ead5f9bc..1325112576199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1078,13 +1078,6 @@ with pkgs; wine = wineWowPackages.stable; }; - x2t = callPackage ../by-name/x2/x2t/package.nix { - openssl = openssl.override { - enableMD2 = true; - static = true; - }; - }; - yabridge = callPackage ../tools/audio/yabridge { wine = wineWowPackages.yabridge; };