diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-27 20:53:55 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-27 20:53:55 +0300 |
| commit | 5471eed63ce770491a93f5c07543ba4ba818a90e (patch) | |
| tree | 4005e3e2a4854472f42dcbde063ab54687f970c5 /pkgs/development | |
| parent | 539f1f36593e2c825dcb9a68ef6abc4dcb3c1af3 (diff) | |
| download | nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.tar nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.tar.gz nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.tar.bz2 nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.tar.lz nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.tar.xz nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.tar.zst nixpkgs-5471eed63ce770491a93f5c07543ba4ba818a90e.zip | |
wxgtk: explicitly link to libX11 and libcairo
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/wxGTK-2.8/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index d7ca92f70d9..50220c227f7 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf +, gstreamer, gst_plugins_base, GConf, libX11, cairo , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] ++ optional withMesa mesa; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { + optionalString withMesa "${mesa}/lib "; # Work around a bug in configure. - NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; + NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" ]; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' |