Unverified Commit 12875080 authored by Arnout Engelen's avatar Arnout Engelen Committed by GitHub
Browse files

x2t: move overrides to package.nix (#485680)

parents 629a0961 91d5d4a9

pkgs/by-name/x2/x2t/package.nix

+8 −4
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −7
Original line number Diff line number Diff line
@@ -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;

  };