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

wineStaging: remove evaluation warning

Browse Source 
cc @peti @7c6f434c
This commit is contained in:
Herwig Hochleitner 2018-01-26 17:19:25 +01:00
parent e3df936356
commit 4e8cd90b67
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/emulators/wine/default.nix
View File

@ -57,7 +57,9 @@ let wine-build = build: release:
in if wineRelease == "staging" then in if wineRelease == "staging" then
let wineUnstable = wine-build wineBuild "unstable"; in let wineUnstable = wine-build wineBuild "unstable"; in
builtins.trace "WARNING: wine staging is not yet at 3.0, using unstable" ( wineUnstable ) # wine staging is not yet at 3.0, using unstable
# FIXME update winestaging sources
wineUnstable
# callPackage ./staging.nix { # callPackage ./staging.nix {
# inherit libtxc_dxtn_Name wineUnstable; # inherit libtxc_dxtn_Name wineUnstable;
# } # }

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

@ -46,7 +46,10 @@ in rec {
}; };
staging = fetchFromGitHub rec { staging = fetchFromGitHub rec {
# https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version; inherit (unstable) version;
# FIXME update winestaging sources, when 3.0 is released
# FIXME then revert the staging derivation in ./default.nix
sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7"; sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7";
owner = "wine-compholio"; owner = "wine-compholio";
repo = "wine-staging"; repo = "wine-staging";
@ -54,6 +57,7 @@ in rec {
}; };
winetricks = fetchFromGitHub rec { winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20171222"; version = "20171222";
sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9"; sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9";
owner = "Winetricks"; owner = "Winetricks";