tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
wine: build wineWow packages on hydra
gnidorah
7 years ago
301789b4
be1461fc
+13
-3
2 changed files
expand all
collapse all
unified
split
pkgs
top-level
all-packages.nix
wine-packages.nix
+11
-1
pkgs/top-level/all-packages.nix
···
21596
pythonPackages = python3Packages;
21597
};
21598
21599
-
winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { });
0
0
0
0
0
0
0
0
0
0
21600
21601
wine = winePackages.full;
21602
···
21596
pythonPackages = python3Packages;
21597
};
21598
21599
+
winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
21600
+
callPackage = newScope self;
21601
+
21602
+
inherit wineBuild;
21603
+
21604
+
inherit (callPackage ./wine-packages.nix {})
21605
+
minimal base full stable unstable staging;
21606
+
});
21607
+
21608
+
winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
21609
+
wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
21610
21611
wine = winePackages.full;
21612
+2
-2
pkgs/top-level/wine-packages.nix
···
1
-
{ stdenv, config, callPackage }:
2
3
rec {
4
minimal = callPackage ../misc/emulators/wine {
5
wineRelease = config.wine.release or "stable";
6
-
wineBuild = config.wine.build or "wine32";
7
};
8
9
base = minimal.override {
···
1
+
{ stdenv, config, callPackage, wineBuild }:
2
3
rec {
4
minimal = callPackage ../misc/emulators/wine {
5
wineRelease = config.wine.release or "stable";
6
+
inherit wineBuild;
7
};
8
9
base = minimal.override {