wine: Unstable 3.3 -> 3.4 & reenable wineStaging

2018-03-24 22:26:51 +01:00
parent faa31ee3ae
commit f8f067d627
2 changed files with 7 additions and 12 deletions
@@ -56,12 +56,9 @@ let wine-build = build: release:
      });

 in if wineRelease == "staging" then
-  let wineUnstable = wine-build wineBuild "unstable"; in
-    # wine staging is not yet at 3.0, using unstable
-    # FIXME update winestaging sources
-    wineUnstable
-    # callPackage ./staging.nix {
-    #   inherit libtxc_dxtn_Name wineUnstable;
-    # }
+  callPackage ./staging.nix {
+    inherit libtxc_dxtn_Name;
+    wineUnstable = wine-build wineBuild "unstable";
+  }
 else
  wine-build wineBuild wineRelease