x2t: move overrides to package.nix
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user