Unverified Commit 1f8d65d6 authored by Tom Hunze's avatar Tom Hunze
Browse files

wineasio: fix build with wine in new wow64 mode 

`wineWowPackages` was deprecated in favor of `wineWow64Packages`
(new WoW64 mode) [1]. In the new WoW64 mode, it's not possible to
build 32-bit Unix libraries anymore [2].

[1] https://github.com/NixOS/nixpkgs/pull/484145
[2] https://bugs.winehq.org/show_bug.cgi?id=58377
parent c6dd6bce

pkgs/by-name/wi/wineasio/package.nix

+3 −8
Original line number Diff line number Diff line 
{

  multiStdenv,

  stdenv,

  lib,

  fetchFromGitHub,

  libjack2,

  pkg-config,

  wineWow64Packages,

  pkgsi686Linux,

  python3,

  python3Packages,

  qt6,

}:



multiStdenv.mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "wineasio";

  version = "1.3.0";
@@ -57,7 +56,6 @@ multiStdenv.mkDerivation rec { 
  ];



  buildInputs = [

    pkgsi686Linux.libjack2

    libjack2

  ];
@@ -67,7 +65,6 @@ multiStdenv.mkDerivation rec { 


  buildPhase = ''

    runHook preBuild

    make "''${makeFlags[@]}" 32

    make "''${makeFlags[@]}" 64

    runHook postBuild

  '';
@@ -75,8 +72,6 @@ multiStdenv.mkDerivation rec { 
  installPhase = ''

    runHook preInstall



    install -D build32/wineasio32.dll    $out/lib/wine/i386-windows/wineasio32.dll

    install -D build32/wineasio32.dll.so $out/lib/wine/i386-unix/wineasio32.dll.so

    install -D build64/wineasio64.dll    $out/lib/wine/x86_64-windows/wineasio64.dll

    install -D build64/wineasio64.dll.so $out/lib/wine/x86_64-unix/wineasio64.dll.so
@@ -95,6 +90,6 @@ multiStdenv.mkDerivation rec { 
      lgpl21

    ];

    maintainers = with lib.maintainers; [ lovesegfault ];

    platforms = lib.platforms.linux;

    platforms = [ "x86_64-linux" ];

  };

}