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

wine: use only native-arch native dependencies

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-12 18:52:05 +03:00
parent ff7f297ea2
commit 71e7f0cad4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/misc/emulators/wine/base.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, pkgArches, { stdenv, lib, pkgArches,
name, version, src, monos, geckos, platforms, name, version, src, monos, geckos, platforms,
pkgconfig, fontforge, makeWrapper, flex, bison,
pulseaudioSupport, pulseaudioSupport,
buildScript ? null, configureFlags ? "" buildScript ? null, configureFlags ? ""
}: }:
@ -14,9 +15,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
}) // rec { }) // rec {
inherit name src configureFlags; inherit name src configureFlags;
nativeBuildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [ nativeBuildInputs = [
pkgconfig fontforge makeWrapper flex bison pkgconfig fontforge makeWrapper flex bison
]); ];
buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses

15
pkgs/misc/emulators/wine/packages.nix
View File

@ -1,31 +1,30 @@
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
pulseaudioSupport, pulseaudioSupport,
wineRelease ? "stable" wineRelease ? "stable"
}: }:
let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
in with src; { in with src; {
wine32 = import ./base.nix { wine32 = callPackage_i686 ./base.nix {
name = "wine-${version}"; name = "wine-${version}";
inherit src version pulseaudioSupport; inherit src version pulseaudioSupport;
inherit (pkgsi686Linux) lib stdenv;
pkgArches = [ pkgsi686Linux ]; pkgArches = [ pkgsi686Linux ];
geckos = [ gecko32 ]; geckos = [ gecko32 ];
monos = [ mono ]; monos = [ mono ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };
wine64 = import ./base.nix { wine64 = callPackage ./base.nix {
name = "wine64-${version}"; name = "wine64-${version}";
inherit src version pulseaudioSupport lib stdenv; inherit src version pulseaudioSupport;
pkgArches = [ pkgs ]; pkgArches = [ pkgs ];
geckos = [ gecko64 ]; geckos = [ gecko64 ];
monos = [ mono ]; monos = [ mono ];
configureFlags = "--enable-win64"; configureFlags = [ "--enable-win64" ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
wineWow = import ./base.nix { wineWow = callPackage ./base.nix {
name = "wine-wow-${version}"; name = "wine-wow-${version}";
inherit src version pulseaudioSupport lib; inherit src version pulseaudioSupport;
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ]; pkgArches = [ pkgs pkgsi686Linux ];
geckos = [ gecko32 gecko64 ]; geckos = [ gecko32 gecko64 ];