From 68be54c8e2d3cf4725d1078af4562dfbec5e3918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 24 Mar 2013 12:36:33 +0100 Subject: [PATCH 1/3] mesa: create a buildEnv that joins mesa (without glu) and glu Since mesa-9.x, upstream has separated mesa and glu. @peti suggested using buildEnv to create a mesa environment that acts like old mesa, which is what this commit does. --- pkgs/development/libraries/mesa-glu/default.nix | 2 -- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 4ff4585dee3..502329226ff 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa_noglu ]; - passthru = { inherit (mesa_noglu) libdrm; inherit mesa_noglu; }; - meta = { description = "OpenGL utility library"; homepage = http://cgit.freedesktop.org/mesa/glu/; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 350a9b06c3a..cb874f8e820 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -12,7 +12,7 @@ let version = "9.1.1"; in stdenv.mkDerivation { - name = "mesa-${version}"; + name = "mesa-noglu-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb96b8a678..60e99962d5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4565,8 +4565,12 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_noglu = callPackage ../development/libraries/mesa { }; + mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL - else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h + else buildEnv { + name = "mesa"; + paths = [ mesa_glu mesa_noglu ]; + }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { From 33798a9a087ac0fa82200a36793368f4bd0ae373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 24 Mar 2013 12:47:16 +0100 Subject: [PATCH 2/3] wxGTK: remove reference to mesa_noglu This is no longer needed since unifying mesa(noglu) and glu in a mesa buildEnv. --- pkgs/development/libraries/wxGTK-2.8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index a73638dc478..e11de87415d 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; SEARCH_LIB = "${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib " - + optionalString withMesa "${mesa.mesa_noglu}/lib ${mesa}/lib "; + + optionalString withMesa "${mesa}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; From ceacc508dcb8d4456ab2b0cf860e991fbda073ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 26 Mar 2013 13:01:18 +0100 Subject: [PATCH 3/3] mesa: append version of mesa_noglu to mesa buildEnv name. --- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cb874f8e820..a3945d77656 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru = { inherit libdrm; }; + passthru = { inherit libdrm; inherit version; }; meta = { description = "An open source implementation of OpenGL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60e99962d5e..2ac0d2fc5bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4568,7 +4568,7 @@ let mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL else buildEnv { - name = "mesa"; + name = "mesa-${mesa_noglu.version}"; paths = [ mesa_glu mesa_noglu ]; }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };