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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-04-21 08:29:51 +02:00
parent d2d7fbc431 b71232fc53
commit 803b3d296c
213 changed files with 3824 additions and 2109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/default.nix
-2
View File
@@ -9,7 +9,6 @@
{ lib, stdenv, callPackage,
wineRelease ? "stable",
wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32",
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
pngSupport ? false,
jpegSupport ? false,
tiffSupport ? false,
@@ -63,7 +62,6 @@ let wine-build = build: release:
in if wineRelease == "staging" then
callPackage ./staging.nix {
inherit libtxc_dxtn_Name;
wineUnstable = wine-build wineBuild "unstable";
}
else
pkgs/misc/emulators/wine/staging.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }:
{ stdenv, callPackage, wineUnstable }:
with callPackage ./util.nix {};
@@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
in assert stdenv.lib.getVersion wineUnstable == patch.version;
stdenv.lib.overrideDerivation wineUnstable (self: {
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs;
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
name = "${self.name}-staging";