Merge: efl: 1.18.x -> 1.19.0 (close #25095)
I used a setupHook instead of patching expressions for individual reverse dependencies (four were broken).
This commit is contained in:
commit
7ee05dff30
|
@ -1,12 +1,18 @@
|
|||
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }:
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
|
||||
, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
|
||||
, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit
|
||||
, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
|
||||
, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
|
||||
, curl, libinput, systemd, writeText
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "efl-${version}";
|
||||
version = "1.18.4";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
|
||||
sha256 = "09c0ajszjarcs6d62zlgnf1aha2f921mfr0gxg6nwza36xzc1srr";
|
||||
sha256 = "1pza8lacqh3bgsvcm4h2hyc577bvnzix932g87dhg03ph4839q54";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
@ -24,16 +30,35 @@ stdenv.mkDerivation rec {
|
|||
libinput ];
|
||||
|
||||
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
|
||||
configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full"
|
||||
"--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--enable-systemd"
|
||||
"--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb"
|
||||
"--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
|
||||
"ac_ct_CXX=foo" ];
|
||||
configureFlags = [
|
||||
"--enable-sdl"
|
||||
"--enable-drm"
|
||||
"--enable-elput"
|
||||
"--with-opengl=full"
|
||||
"--enable-image-loader-jp2k"
|
||||
"--enable-xinput22"
|
||||
"--enable-multisense"
|
||||
"--enable-liblz4"
|
||||
"--enable-systemd"
|
||||
"--enable-image-loader-webp"
|
||||
"--enable-harfbuzz"
|
||||
"--enable-xine"
|
||||
"--enable-fb"
|
||||
"--disable-tslib"
|
||||
"--with-systemdunitdir=$out/systemd/user"
|
||||
"ac_ct_CXX=foo"
|
||||
];
|
||||
|
||||
patches = [ ./efl-elua.patch ];
|
||||
|
||||
# bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies.
|
||||
setupHook = writeText "setupHook.sh" ''
|
||||
export HOME="$TEMPDIR"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
|
||||
source "$setupHook"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -48,8 +73,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Enlightenment foundation libraries";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -29062,10 +29062,10 @@ EOF
|
|||
# Should be bumped along with EFL!
|
||||
pythonefl = buildPythonPackage rec {
|
||||
name = "python-efl-${version}";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
|
||||
sha256 = "0p92xsw7sh7965mb097lxy98va5xsrkxdqqaq11fhkpwqccy2l8p";
|
||||
sha256 = "105qykdd04mlyzwzyscw6mlc7ajl4wbwhq87ncy1jvw8jjh6jads";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -29080,9 +29080,9 @@ EOF
|
|||
meta = {
|
||||
description = "Python bindings for EFL and Elementary";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue