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

wxGTK28: fix building + minor update

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-01 01:34:12 +01:00
parent aa0fb73064
commit f549fc477d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ mesa_noglu ];
passthru = { inherit (mesa_noglu) libdrm; };
passthru = { inherit (mesa_noglu) libdrm; inherit mesa_noglu; };
meta = {
description = "OpenGL utility library";

16
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -7,12 +7,13 @@ assert withMesa -> mesa != null;
with stdenv.lib;
stdenv.mkDerivation {
name = "wxGTK-2.8.12";
stdenv.mkDerivation rec {
version = "2.8.12.1";
name = "wxGTK-${version}";
src = fetchurl {
url = mirror://sourceforge/wxwindows/wxGTK-2.8.12.tar.gz;
sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
};
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
@ -29,11 +30,12 @@ stdenv.mkDerivation {
"--enable-mediactrl"
] ++ optional withMesa "--with-opengl";
# This variable is used by configure to find some dependencies.
# These variables are used by configure to find some dependencies.
SEARCH_INCLUDE =
"${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
SEARCH_LIB = optionalString withMesa "${mesa}/lib";
SEARCH_LIB =
"${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib "
+ optionalString withMesa "${mesa.mesa_noglu}/lib ${mesa}/lib ";
# Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";