diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-07 23:51:27 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-08 00:25:04 +0000 |
commit | 096ca241d9505c265fe46cacec7b316eecb401ad (patch) | |
tree | 1c4f5daadf7a0f2544ef9b1d219ddcca6867df0d /pkgs/development/libraries/wxwidgets/2.8/default.nix | |
parent | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (diff) | |
parent | 5f6df74f66246a2eb198b0bc3fe1f7d2dff57062 (diff) | |
download | nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.gz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.bz2 nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.lz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.xz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.zst nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.zip |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/development/libraries/wxwidgets/2.8/default.nix')
-rw-r--r-- | pkgs/development/libraries/wxwidgets/2.8/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 38ee4376ac2..73dac47307a 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. - NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' |