Unverified Commit b54cebbc authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #286580 from SuperSamus/wine-update 

winePackages{unstable,staging}: 9.0 -> 9.2, cleanup
parents 01737456 b2182b91

pkgs/applications/emulators/wine/base.nix

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ let 
      mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs;

    };

  } ./setup-hook-darwin.sh;

  darwinUnsupportedFlags = [ "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" ];

  darwinUnsupported = builtins.any (name: builtins.getAttr name supportFlags) darwinUnsupportedFlags;

in

stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {

  builder = buildScript;
@@ -47,7 +49,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 
}) // rec {

  inherit version src;



  pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland";

  pname = prevName + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}";



  # Fixes "Compiler cannot create executables" building wineWow with mingwSupport

  strictDeps = true;
@@ -209,8 +211,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 
      binaryNativeCode  # mono, gecko

    ];

    broken = stdenv.isDarwin && !supportFlags.mingwSupport;

    description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";

    platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;

    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";

    platforms = if darwinUnsupported then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;

    maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ];

    inherit mainProgram;

  };

pkgs/applications/emulators/wine/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 
  vulkanSupport ? false,

  sdlSupport ? false,

  usbSupport ? false,

  mingwSupport ? wineRelease != "stable",

  waylandSupport ? stdenv.isLinux,

  x11Support ? stdenv.isLinux,

  mingwSupport ? false,

  waylandSupport ? false,

  x11Support ? false,

  embedInstallers ? false, # The Mono and Gecko MSI installers

  moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily

}:

pkgs/applications/emulators/wine/sources.nix

+10 −9
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ in rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "9.0";

    url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";

    hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";

    version = "9.2";

    url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";

    hash = "sha256-goHFoILMR6w8LJHOqt5fFzllU7Oa3LMudBJThltlgWI=";

    inherit (stable) patches;



    ## see http://wiki.winehq.org/Gecko
@@ -88,9 +88,9 @@ in rec { 


    ## see http://wiki.winehq.org/Mono

    mono = fetchurl rec {

      version = "8.1.0";

      version = "9.0.0";

      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";

      hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA=";

      hash = "sha256-efbEMQBnVWbBEvQZm56nuUTTOBZLNL2R+hGwsKQU4cQ=";

    };



    updateScript = writeShellScript "update-wine-unstable" ''
@@ -114,11 +114,12 @@ in rec { 
    '';

  };



  staging = fetchFromGitHub rec {

    # https://github.com/wine-staging/wine-staging/releases

  staging = fetchFromGitLab rec {

    # https://gitlab.winehq.org/wine/wine-staging

    inherit (unstable) version;

    hash = "sha256-lE/95OZigifreaRRCPkvA+Z0FqsBmm018jD6leSysXU=";

    owner = "wine-staging";

    hash = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco=";

    domain = "gitlab.winehq.org";

    owner = "wine";

    repo = "wine-staging";

    rev = "v${version}";

pkgs/applications/emulators/wine/staging.nix

+1 −3
Original line number Diff line number Diff line
@@ -7,12 +7,10 @@ let patch = (callPackage ./sources.nix {}).staging; 
      (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;

in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version;



(lib.overrideDerivation wineUnstable (self: {

(lib.overrideDerivation (wineUnstable.override { wineRelease = "staging"; }) (self: {

  buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;

  nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;



  name = "${self.name}-staging";



  prePatch = self.prePatch or "" + ''

    patchShebangs tools

    cp -r ${patch}/patches ${patch}/staging .

pkgs/top-level/wine-packages.nix

+4 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ rec { 
    sdlSupport = true;

    mingwSupport = true;

    usbSupport = true;

    waylandSupport = stdenv.isLinux;

    x11Support = stdenv.isLinux;

  };



  full = base.override {
@@ -50,6 +52,6 @@ rec { 
  staging = base.override { wineRelease = "staging"; };

  stagingFull = full.override { wineRelease = "staging"; };



  wayland = base.override { wineRelease = "wayland"; };

  waylandFull = full.override { wineRelease = "wayland"; };

  wayland = base.override { wineRelease = "wayland"; waylandSupport = true; };

  waylandFull = full.override { wineRelease = "wayland"; waylandSupport = true; };

}