mesa: add support for wayland to default version.

Remove duplicated versions now that mesa and libdrm are updated.

5 files changed, 8 insertions, 97 deletions

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index f5d4e346f9fe..0f5f5d6bfcdf 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, wayland, mesa90x, libxkbcommon, pixman
-, cairo, libxcb, libXcursor, x11, udev, libdrm2_4_40, mtdev
+, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
 , libjpeg, pam, autoconf, automake, libtool }:
 
 let version = "1.0.5"; in
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig wayland mesa90x libxkbcommon pixman
-    cairo libxcb libXcursor x11 udev libdrm2_4_40 mtdev
+    cairo libxcb libXcursor x11 udev libdrm mtdev
     libjpeg pam autoconf automake libtool ];
 
   preConfigure = "autoreconf -vfi";
diff --git a/pkgs/development/libraries/libdrm/2.4.40.nix b/pkgs/development/libraries/libdrm/2.4.40.nix
deleted file mode 100644
index b36fcd602028..000000000000
--- a/pkgs/development/libraries/libdrm/2.4.40.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
-
-stdenv.mkDerivation rec {
-  name = "libdrm-2.4.40";
-  
-  src = fetchurl {
-    url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "07xazz6flzc2khvks2cxls36sbsx0ns3x2cj499dw3za0134xha8";
-  };
-
-  buildNativeInputs = [ pkgconfig ];
-  buildInputs = [ libpthreadstubs libpciaccess udev ];
-
-  patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
-
-  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
-    "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
-
-  configureFlags = [ "--enable-nouveau-experimental-api"
-                     "--enable-radeon-experimental-api"
-                     "--enable-udev" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-C";
-
-  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
-
-  meta = {
-    homepage = http://dri.freedesktop.org/libdrm/;
-    description = "Library for accessing the kernel's Direct Rendering Manager";
-    license = "bsd";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/mesa/9.0.x.nix b/pkgs/development/libraries/mesa/9.0.x.nix
deleted file mode 100644
index 4b549b6a5a92..000000000000
--- a/pkgs/development/libraries/mesa/9.0.x.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, autoreconfHook, libtool
-, flex, bison, pkgconfig, libdrm2_4_40, file, expat, makedepend, llvm
-, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
-, libXt, udev, enableTextureFloats ? false
-, python, libxml2Python, wayland }:
-
-if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
-  throw "unsupported platform for Mesa"
-else
-
-let version = "9.0.2"; in
-
-stdenv.mkDerivation {
-  name = "mesa-${version}";
-
-  src = fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    md5 = "dc45d1192203e418163e0017640e1cfc";
-  };
-
-  patches =
-    stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
-
-  prePatch = "patchShebangs .";
-
-  configureFlags =
-      " --enable-gles1 --enable-gles2 --disable-gallium-egl"
-    + " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi"
-    + " --with-gallium-drivers=i915,nouveau,r600,svga,swrast"
-    # Texture floats are patented, see docs/patents.txt
-    + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
-
-  buildInputs = [ autoconf automake autoreconfHook libtool
-    expat libdrm2_4_40 libXxf86vm libXfixes libXdamage glproto dri2proto llvm
-    libxml2Python libX11 libXext libxcb libXt udev wayland ];
-
-  buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
-
-  enableParallelBuilding = true;
-
-  passthru = { inherit libdrm2_4_40; };
-
-  meta = {
-    description = "An open source implementation of OpenGL";
-    homepage = http://www.mesa3d.org/;
-    license = "bsd";
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a5110d0b45ef..3cf81edb5e97 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
 , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
 , libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false
-, python, libxml2Python, autoconf, automake, libtool, llvm, writeText }:
+, python, libxml2Python, autoconf, automake, libtool, llvm, writeText
+, wayland }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
@@ -24,14 +25,15 @@ stdenv.mkDerivation {
 
   configureFlags =
     ""
-    + " --enable-gles1 --enable-gles2 --enable-gallium-egl"
-    + " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
+    + " --enable-gles1 --enable-gles2 --disable-gallium-egl"
+    + " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi"
+    + " --with-gallium-drivers=nouveau,r300,r600,svga,swrast"
     + stdenv.lib.optionalString enableR600LlvmCompiler " --enable-r600-llvm-compiler"
     # Texture floats are patented, see docs/patents.txt
     + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
 
   buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
-    libxml2Python libX11 libXext libxcb libXt udev llvm ];
+    libxml2Python libX11 libXext libxcb libXt udev llvm wayland ];
 
   buildNativeInputs = [ pkgconfig python makedepend file flex bison automake autoconf libtool ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2e3f1f2bfea..63002cd9c76f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4198,11 +4198,6 @@ let
     inherit (xorg) libpthreadstubs;
   };
 
-  libdrm2_4_40 = callPackage ../development/libraries/libdrm/2.4.40.nix {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (xorg) libpthreadstubs;
-  };
-
   libdv = callPackage ../development/libraries/libdv { };
 
   libdvbpsi = callPackage ../development/libraries/libdvbpsi { };
@@ -4629,8 +4624,6 @@ let
     else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h
   darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };
 
-  mesa90x = callPackage ../development/libraries/mesa/9.0.x.nix { };
-
   metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
     sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
     toolbuslib    = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; };
@@ -8025,7 +8018,6 @@ let
 
   weston = callPackage ../applications/window-managers/weston {
     cairo = cairo.override {
-      xcbSupport = true;
       glSupport = true;
     };
   };