Merge pull request #87757 from romildo/upd.efl

enlightenment.efl: 1.24.0 -> 1.24.1
This commit is contained in:
José Romildo Malaquias 2020-05-14 19:41:28 -03:00 committed by GitHub
commit 15f2810b62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,10 +3,8 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, SDL
, SDL2 , SDL2
, alsaLib , alsaLib
, avahi
, bullet , bullet
, check , check
, curl , curl
@ -55,11 +53,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "efl"; pname = "efl";
version = "1.24.0"; version = "1.24.1";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"; sha256 = "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -71,8 +69,6 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
SDL
avahi
fontconfig fontconfig
freetype freetype
giflib giflib
@ -123,7 +119,6 @@ stdenv.mkDerivation rec {
luajit luajit
openjpeg openjpeg
poppler poppler
python3Packages.dbus-python
utillinux utillinux
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libXcomposite xorg.libXcomposite
@ -132,13 +127,10 @@ stdenv.mkDerivation rec {
xorg.libXfixes xorg.libXfixes
xorg.libXi xorg.libXi
xorg.libXinerama xorg.libXinerama
xorg.libXp
xorg.libXrandr xorg.libXrandr
xorg.libXrender xorg.libXrender
xorg.libXtst xorg.libXtst
xorg.libxcb xorg.libxcb
xorg.libxkbfile
xorg.xcbutilkeysyms
]; ];
dontDropIconThemeCache = true; dontDropIconThemeCache = true;
@ -147,11 +139,10 @@ stdenv.mkDerivation rec {
"--buildtype=release" "--buildtype=release"
"-D build-tests=false" # disable build tests, which are not working "-D build-tests=false" # disable build tests, which are not working
"-D drm=true" "-D drm=true"
"-D embedded-lz4=false"
"-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 disalbed by default, scim is not availabe in nixpkgs
"-D evas-loaders-disabler=json" "-D embedded-lz4=false"
"-D fb=true" "-D fb=true"
"-D opengl=full" "-D network-backend=connman"
"-D sdl=true" "-D sdl=true"
]; ];