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

* Fix Mesa-related evaluation errors.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8708
This commit is contained in:
Eelco Dolstra 2007-05-16 14:49:28 +00:00
parent ffa7b32970
commit 41291a5b26
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/jdk/default.nix
View File

@ -4,7 +4,7 @@ if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" th
(import ./jdk6-linux.nix) args (import ./jdk6-linux.nix) args
else if args.stdenv.system == "powerpc-linux" then else if args.stdenv.system == "powerpc-linux" then
(import ./jdk5-ibm-powerpc-linux.nix) args (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["libstdcpp5" "pluginSupport" "xlibs" "installjdk"])
else else
abort "the JDK is not supported on this platform" abort "the JDK is not supported on this platform"

2
pkgs/development/libraries/mesa/default.nix
View File

@ -5,7 +5,7 @@ let
target = target =
if stdenv.system == "i686-linux" then "linux-dri-x86" else if stdenv.system == "i686-linux" then "linux-dri-x86" else
if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else
abort "unsupported platform for Mesa"; abort "unsupported platform for Mesa"; # !!! change to throw, remove all the mesa asserts in all-packages.nix
in in

33
pkgs/top-level/all-packages.nix
View File

@ -342,7 +342,7 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
glxinfo = import ../tools/graphics/glxinfo { glxinfo = assert mesaSupported; import ../tools/graphics/glxinfo {
inherit fetchurl stdenv x11 mesa; inherit fetchurl stdenv x11 mesa;
}; };
@ -745,14 +745,11 @@ rec {
system == "powerpc-linux"; system == "powerpc-linux";
jdkdistro = installjdk: pluginSupport: jdkdistro = installjdk: pluginSupport:
if stdenv.isDarwin then assert supportsJDK;
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" (if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk {
else inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
assert supportsJDK; libstdcpp5 = gcc33.gcc;
(if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk { });
inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
libstdcpp5 = gcc33.gcc;
});
jikes = import ../development/compilers/jikes { jikes = import ../development/compilers/jikes {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -1294,7 +1291,7 @@ rec {
inherit fetchurl stdenv openal; inherit fetchurl stdenv openal;
}; };
freeglut = import ../development/libraries/freeglut { freeglut = assert mesaSupported; import ../development/libraries/freeglut {
inherit fetchurl stdenv x11 mesa; inherit fetchurl stdenv x11 mesa;
}; };
@ -1442,7 +1439,7 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
libcm = import ../development/libraries/libcm { libcm = assert mesaSupported; import ../development/libraries/libcm {
inherit fetchurl stdenv pkgconfig xlibs mesa; inherit fetchurl stdenv pkgconfig xlibs mesa;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };
@ -1576,7 +1573,11 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
mesa = import ../development/libraries/mesa { mesaSupported =
system == "i686-linux" ||
system == "x86_64-linux";
mesa = assert mesaSupported; import ../development/libraries/mesa {
inherit fetchurl stdenv pkgconfig x11 libdrm; inherit fetchurl stdenv pkgconfig x11 libdrm;
inherit (xlibs) libXmu libXi makedepend glproto libXxf86vm; inherit (xlibs) libXmu libXi makedepend glproto libXxf86vm;
}; };
@ -1646,7 +1647,7 @@ rec {
inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
inherit (xlibs) xextproto libXft libXrender libXrandr randrproto inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
libXmu libXinerama xineramaproto libXcursor; libXmu libXinerama xineramaproto libXcursor;
openglSupport = true; openglSupport = mesaSupported;
mysqlSupport = false; mysqlSupport = false;
}; };
@ -1667,7 +1668,7 @@ rec {
SDL = import ../development/libraries/SDL { SDL = import ../development/libraries/SDL {
inherit fetchurl stdenv x11 mesa alsaLib; inherit fetchurl stdenv x11 mesa alsaLib;
inherit (xlibs) libXrandr; inherit (xlibs) libXrandr;
openglSupport = true; openglSupport = mesaSupported;
alsaSupport = true; alsaSupport = true;
}; };
@ -2580,7 +2581,7 @@ rec {
}; };
}; };
compiz = import ../applications/window-managers/compiz { compiz = assert mesaSupported; import ../applications/window-managers/compiz {
inherit fetchurl stdenv pkgconfig libpng mesa; inherit fetchurl stdenv pkgconfig libpng mesa;
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
libXinerama libICE libSM libXrender xextproto; libXinerama libICE libSM libXrender xextproto;
@ -2704,7 +2705,7 @@ rec {
inherit fetchurl stdenv curl openssl zlib expat perl; inherit fetchurl stdenv curl openssl zlib expat perl;
}; };
gnash = import ../applications/video/gnash { gnash = assert mesaSupported; import ../applications/video/gnash {
inherit fetchurl stdenv SDL SDL_mixer GStreamer inherit fetchurl stdenv SDL SDL_mixer GStreamer
libogg libxml2 libjpeg mesa libpng; libogg libxml2 libjpeg mesa libpng;
inherit (xlibs) libX11 libXext libXi libXmu; inherit (xlibs) libX11 libXext libXi libXmu;