Skip to content

Commit

Permalink
Merge pull request #87757 from romildo/upd.efl
Browse files Browse the repository at this point in the history
enlightenment.efl: 1.24.0 -> 1.24.1
  • Loading branch information
romildo committed May 14, 2020
2 parents 62ee53f + 7bb9ae7 commit 15f2810
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions pkgs/desktops/enlightenment/efl.nix
Expand Up @@ -3,10 +3,8 @@
, meson
, ninja
, pkgconfig
, SDL
, SDL2
, alsaLib
, avahi
, bullet
, check
, curl
Expand Down Expand Up @@ -55,11 +53,11 @@

stdenv.mkDerivation rec {
pname = "efl";
version = "1.24.0";
version = "1.24.1";

src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk";
sha256 = "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7";
};

nativeBuildInputs = [
Expand All @@ -71,8 +69,6 @@ stdenv.mkDerivation rec {
];

buildInputs = [
SDL
avahi
fontconfig
freetype
giflib
Expand Down Expand Up @@ -123,7 +119,6 @@ stdenv.mkDerivation rec {
luajit
openjpeg
poppler
python3Packages.dbus-python
utillinux
xorg.libXScrnSaver
xorg.libXcomposite
Expand All @@ -132,13 +127,10 @@ stdenv.mkDerivation rec {
xorg.libXfixes
xorg.libXi
xorg.libXinerama
xorg.libXp
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
xorg.libxkbfile
xorg.xcbutilkeysyms
];

dontDropIconThemeCache = true;
Expand All @@ -147,11 +139,10 @@ stdenv.mkDerivation rec {
"--buildtype=release"
"-D build-tests=false" # disable build tests, which are not working
"-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 evas-loaders-disabler=json"
"-D embedded-lz4=false"
"-D fb=true"
"-D opengl=full"
"-D network-backend=connman"
"-D sdl=true"
];

Expand Down

0 comments on commit 15f2810

Please sign in to comment.