Unverified Commit d8c09e3f authored by Randy Eckenrode's avatar Randy Eckenrode Committed by GitHub
Browse files

Merge pull request #330901 from kkoniuszy/wine-unstable-9.14 

wineWow64Packages.unstableFull: 9.12 -> 9.14
parents e0dd2a0b fe0481e7

pkgs/applications/emulators/wine/sources.nix

+3 −3
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.12";

    version = "9.14";

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

    hash = "sha256-CRRa5yCy+fGBh5cLoGQLvzztWujceK8dfVf1B37CavY=";

    hash = "sha256-JFcvSc80c/ye8qGtHN31Ec4O9D2qVUE7RyCmw+PInqY=";

    inherit (stable) patches;



    ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec { 
  staging = fetchFromGitLab rec {

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

    inherit (unstable) version;

    hash = "sha256-lvjuohEo4pwCAd1KmLjUBakS5gSN+Ic6+QQ18sS3axw=";

    hash = "sha256-IvT56lWULfA5MFLEjnpnNX4OhjQwR6XqBGJ3i4nqJrk=";

    domain = "gitlab.winehq.org";

    owner = "wine";

    repo = "wine-staging";

pkgs/applications/emulators/wine/staging.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:

{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable, gitMinimal }:



with callPackage ./util.nix {};
@@ -9,7 +9,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino 


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

  buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs;

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

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



  prePatch = self.prePatch or "" + ''

    patchShebangs tools