diff options
| author | Arnout Engelen <arnout@engelen.eu> | 2026-02-01 11:05:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-01 11:05:54 +0000 |
| commit | 12875080afe5be93ca88cd69c10a4c0a18053c77 (patch) | |
| tree | d866212839b3ef67393f35a88e675c16390ee7f8 | |
| parent | bluetui: 0.8.0 -> 0.8.1 (#485752) (diff) | |
| parent | x2t: move overrides to package.nix (diff) | |
| download | nixpkgs-12875080afe5be93ca88cd69c10a4c0a18053c77.tar.gz | |
x2t: move overrides to package.nix (#485680)
| -rw-r--r-- | pkgs/by-name/x2/x2t/package.nix | 12 | ||||
| -rw-r--r-- | 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 9d619cdfd18e..482c00705f1d 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 348f209ac8b3..8414680b667c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1070,13 +1070,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; }; |