diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
| commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
| tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/misc/emulators/wxmupen64plus/default.nix | |
| parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
| parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
| download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip | |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/misc/emulators/wxmupen64plus/default.nix')
| -rw-r--r-- | pkgs/misc/emulators/wxmupen64plus/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 0366b9dd22ce..aec498b899e4 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configurePhase = '' tar xf ${mupen64plus.src} APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) - export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" + export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" export LDFLAGS="-lwx_gtk2u_adv-2.9" python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out ''; |