diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2018-01-26 17:19:25 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-01-26 17:21:58 +0100 |
| commit | 4e8cd90b67ec52f19a14bed92540bc092622f27b (patch) | |
| tree | de0b887f37c7f196f3ec12733a3235153ba03c38 | |
| parent | e3df936356b76488b398f2ef667527aadba658c5 (diff) | |
| download | nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.tar nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.tar.gz nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.tar.bz2 nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.tar.lz nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.tar.xz nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.tar.zst nixpkgs-4e8cd90b67ec52f19a14bed92540bc092622f27b.zip | |
wineStaging: remove evaluation warning
cc @peti @7c6f434c
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index ae3617aedf0..928e692df6b 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -57,7 +57,9 @@ let wine-build = build: release: in if wineRelease == "staging" then 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 { # inherit libtxc_dxtn_Name wineUnstable; # } diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index ca7c760dc5c..c276a24b183 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -46,7 +46,10 @@ in rec { }; staging = fetchFromGitHub rec { + # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; + # FIXME update winestaging sources, when 3.0 is released + # FIXME then revert the staging derivation in ./default.nix sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7"; owner = "wine-compholio"; repo = "wine-staging"; @@ -54,6 +57,7 @@ in rec { }; winetricks = fetchFromGitHub rec { + # https://github.com/Winetricks/winetricks/releases version = "20171222"; sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9"; owner = "Winetricks"; |