From 1141264c3a4a82d6f025a2903a302ae312e7732b Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 21 Apr 2017 14:49:28 -0300 Subject: [PATCH 1/4] efl: 1.18.4 -> 1.19.0 --- pkgs/desktops/enlightenment/efl.nix | 30 +++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 45e547f4a22a..ac64eb5c7381 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -2,11 +2,11 @@ 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 +24,30 @@ 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 ]; preConfigure = '' export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" + export HOME="$TEMPDIR" ''; postInstall = '' @@ -48,8 +62,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 ]; }; } From d03ee9df41c0e51049411d9d8d98f6f4f03d76dd Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 21 Apr 2017 15:16:39 -0300 Subject: [PATCH 2/4] pythonefl: 1.18.0 -> 1.19.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bde08d5c12a..49c8394b564a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29223,10 +29223,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 = '' @@ -29241,9 +29241,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 ]; }; }; From aa044dd105b41c9825de5bd6e00a87f8a1b2a639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 30 Apr 2017 11:20:08 +0200 Subject: [PATCH 3/4] efl: wrap the first line It was >400 chars long! --- pkgs/desktops/enlightenment/efl.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index ac64eb5c7381..1f1c6dc6a2ed 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,4 +1,10 @@ -{ 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 +}: stdenv.mkDerivation rec { name = "efl-${version}"; From 18a7f7d4a5634fd21959d23bbbc1ad2abb9f34b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 30 Apr 2017 11:35:59 +0200 Subject: [PATCH 4/4] efl: set $HOME for reverse dependencies --- pkgs/desktops/enlightenment/efl.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 1f1c6dc6a2ed..32b2fe31a5e2 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,7 +3,7 @@ , 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 +, curl, libinput, systemd, writeText }: stdenv.mkDerivation rec { @@ -51,9 +51,14 @@ stdenv.mkDerivation rec { 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" - export HOME="$TEMPDIR" + source "$setupHook" ''; postInstall = ''