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

all-packages: Use callPackage where possible

Browse Source
This commit is contained in:
Mathnerd314
2015-09-14 22:27:19 -06:00
parent 7fb1c7efcf
commit eb7404d97a
64 changed files with 409 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
# };
# Make additional configurations on demand:
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, pkgs, system, callPackage,
{ lib, pkgs, system, callPackage, wineUnstable,
wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
@@ -14,7 +14,7 @@
if wineRelease == "staging" then
callPackage ./staging.nix {
inherit libtxc_dxtn_Name;
wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; });
wine = wineUnstable;
}
else
lib.getAttr wineBuild (callPackage ./packages.nix {