diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-28 10:21:56 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-28 10:21:56 +0100 |
| commit | 4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095 (patch) | |
| tree | a174de93bdb4fbd925bbd06b6eb7d40299f5682f | |
| parent | 2627198b0c047519afa105ba1e335799075128c7 (diff) | |
| parent | 812e2734a56feabbbeaaffefbf90b7bca55c88b3 (diff) | |
| download | nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.tar nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.tar.gz nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.tar.bz2 nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.tar.lz nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.tar.xz nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.tar.zst nixlib-4fdf1fcbb97d5738bfccc7a9062ee8a5e6c7c095.zip | |
Merge pull request #5485 from matejc/eflfix
efl: fix build
| -rw-r--r-- | pkgs/desktops/e19/efl.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 6dae5f038778..9cc936e7f5ec 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -20,10 +20,12 @@ stdenv.mkDerivation rec { xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; + # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" - "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" ]; + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" + "ac_ct_CXX=foo" ]; NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; |