public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46738 from ikervagyok/wine

Browse Source 
wine: 3.0.2 -> 3.0.3, 3.17 -> 3.18
This commit is contained in:
Yegor Timoshenko 2018-10-13 15:16:00 +00:00 committed by GitHub
commit 60593ff330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/vulkan-loader/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
let version = "1.1.82.0"; in let version = "1.1.85"; in
assert version == vulkan-headers.version; assert version == vulkan-headers.version;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vulkan-loader-${version}"; name = "vulkan-loader-${version}";

5
pkgs/misc/emulators/wine/base.nix
View File

@ -1,7 +1,6 @@
{ stdenv, lib, pkgArches, { stdenv, lib, pkgArches,
name, version, src, monos, geckos, platforms, name, version, src, monos, geckos, platforms,
# flex 2.6.3 causes: undefined reference to `yywrap' pkgconfig, fontforge, makeWrapper, flex, bison,
pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison,
supportFlags, supportFlags,
buildScript ? null, configureFlags ? [] buildScript ? null, configureFlags ? []
}: }:
@ -14,7 +13,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
inherit name src configureFlags; inherit name src configureFlags;
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig fontforge makeWrapper flex_2_6_1 bison pkgconfig fontforge makeWrapper flex bison
]; ];
buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:

10
pkgs/misc/emulators/wine/sources.nix
View File

@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
in rec { in rec {
stable = fetchurl rec { stable = fetchurl rec {
version = "3.0.2"; version = "3.0.3";
url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya"; sha256 = "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b";
## see http://wiki.winehq.org/Gecko ## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec { gecko32 = fetchurl rec {
@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec { unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well. # NOTE: Don't forget to change the SHA256 for staging as well.
version = "3.17"; version = "3.18";
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac"; sha256 = "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v";
inherit (stable) mono gecko32 gecko64; inherit (stable) mono gecko32 gecko64;
}; };
staging = fetchFromGitHub rec { staging = fetchFromGitHub rec {
# https://github.com/wine-compholio/wine-staging/releases # https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version; inherit (unstable) version;
sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w"; sha256 = "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp";
owner = "wine-staging"; owner = "wine-staging";
repo = "wine-staging"; repo = "wine-staging";
rev = "v${version}"; rev = "v${version}";