wine: use only native-arch native dependencies

Changed files
+10 -10
pkgs
misc
emulators
+3 -2
pkgs/misc/emulators/wine/base.nix
···
{ stdenv, lib, pkgArches,
name, version, src, monos, geckos, platforms,
pulseaudioSupport,
buildScript ? null, configureFlags ? ""
}:
···
}) // rec {
inherit name src configureFlags;
-
nativeBuildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [
pkgconfig fontforge makeWrapper flex bison
-
]);
buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
···
{ stdenv, lib, pkgArches,
name, version, src, monos, geckos, platforms,
+
pkgconfig, fontforge, makeWrapper, flex, bison,
pulseaudioSupport,
buildScript ? null, configureFlags ? ""
}:
···
}) // rec {
inherit name src configureFlags;
+
nativeBuildInputs = [
pkgconfig fontforge makeWrapper flex bison
+
];
buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
+7 -8
pkgs/misc/emulators/wine/packages.nix
···
-
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
pulseaudioSupport,
wineRelease ? "stable"
}:
let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
in with src; {
-
wine32 = import ./base.nix {
name = "wine-${version}";
inherit src version pulseaudioSupport;
-
inherit (pkgsi686Linux) lib stdenv;
pkgArches = [ pkgsi686Linux ];
geckos = [ gecko32 ];
monos = [ mono ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
-
wine64 = import ./base.nix {
name = "wine64-${version}";
-
inherit src version pulseaudioSupport lib stdenv;
pkgArches = [ pkgs ];
geckos = [ gecko64 ];
monos = [ mono ];
-
configureFlags = "--enable-win64";
platforms = [ "x86_64-linux" ];
};
-
wineWow = import ./base.nix {
name = "wine-wow-${version}";
-
inherit src version pulseaudioSupport lib;
stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ];
geckos = [ gecko32 gecko64 ];
···
+
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
pulseaudioSupport,
wineRelease ? "stable"
}:
let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
in with src; {
+
wine32 = callPackage_i686 ./base.nix {
name = "wine-${version}";
inherit src version pulseaudioSupport;
pkgArches = [ pkgsi686Linux ];
geckos = [ gecko32 ];
monos = [ mono ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
+
wine64 = callPackage ./base.nix {
name = "wine64-${version}";
+
inherit src version pulseaudioSupport;
pkgArches = [ pkgs ];
geckos = [ gecko64 ];
monos = [ mono ];
+
configureFlags = [ "--enable-win64" ];
platforms = [ "x86_64-linux" ];
};
+
wineWow = callPackage ./base.nix {
name = "wine-wow-${version}";
+
inherit src version pulseaudioSupport;
stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ];
geckos = [ gecko32 gecko64 ];