diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2020-09-28 09:04:45 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-28 09:04:45 -0300 |
commit | d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec (patch) | |
tree | c025c09a08d09e3975652e29cb991f775b09ddd5 /pkgs/desktops | |
parent | 514bda6825df8b30a418e6072f31cdaf1474d5b6 (diff) | |
parent | 9c132e34b3ad4b4e386766c972018d358963a4b8 (diff) | |
download | nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.tar nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.tar.gz nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.tar.bz2 nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.tar.lz nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.tar.xz nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.tar.zst nixpkgs-d2f65bfe8fc8067b0b34c53bb9986a065de1c9ec.zip |
Merge pull request #98896 from romildo/upd.efl
{enlightenment.efl,pythonPackages.pythonefl}: 1.24.3 -> 1.25.0
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/enlightenment/efl/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 9ce0306b549..6c981e9c93b 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.3"; + version = "1.25.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a"; + sha256 = "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k"; }; nativeBuildInputs = [ @@ -142,16 +142,17 @@ stdenv.mkDerivation rec { "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working "-D drm=true" - "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" "-D network-backend=connman" "-D sdl=true" + "-D elua=true" + "-D bindings=lua,cxx" ]; patches = [ ./efl-elua.patch - ./0002-efreet-more-stat-info-changes.patch ]; postPatch = '' @@ -174,11 +175,10 @@ stdenv.mkDerivation rec { source "$setupHook" ''; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - postInstall = '' # fix use of $out variable substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" + rm "$out/share/elua/core/util.lua.orig" # add all module include dirs to the Cflags field in efl.pc modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) |