public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27941 from romildo/upd.efl

Browse Source 
efl: add version 1.20.2
This commit is contained in:
Frederik Rietdijk 2017-08-17 19:43:11 +02:00 committed by GitHub
commit c732164e36
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/enlightenment/default.nix
View File

@ -2,6 +2,7 @@
rec { rec {
#### CORE EFL #### CORE EFL
efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
efl_1_19 = callPackage ./efl.nix { eflVersion = "1.19.1"; openjpeg = pkgs.openjpeg_1; };
#### WINDOW MANAGER #### WINDOW MANAGER
enlightenment = callPackage ./enlightenment.nix { }; enlightenment = callPackage ./enlightenment.nix { };
@ -10,5 +11,5 @@ rec {
econnman = callPackage ./econnman.nix { }; econnman = callPackage ./econnman.nix { };
terminology = callPackage ./terminology.nix { }; terminology = callPackage ./terminology.nix { };
rage = callPackage ./rage.nix { }; rage = callPackage ./rage.nix { };
ephoto = callPackage ./ephoto.nix { }; ephoto = callPackage ./ephoto.nix { efl = efl_1_19; };
} }

9
pkgs/desktops/enlightenment/efl.nix
View File

@ -4,15 +4,20 @@
, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
, curl, libinput, systemd, writeText , curl, libinput, systemd, writeText
# Support more than one version because for now ephoto does not work with efl-1.20.x
, eflVersion ? "1.20.2"
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.19.1"; version = eflVersion;
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc"; sha256 = {
"1.19.1" = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc";
"1.20.2" = "0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55";
}.${version};
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

6
pkgs/desktops/enlightenment/enlightenment.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp, { stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp,
libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap,
mesa_glu , xkeyboard_config }: mesa_glu, xkeyboard_config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enlightenment-${version}"; name = "enlightenment-${version}";
version = "0.21.8"; version = "0.21.9";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
sha256 = "0cjjiip12hd8bfjl9ccl3vzl81pxh1wpymxk2yvrzf6ap5girhps"; sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

6
pkgs/top-level/python-packages.nix
View File

@ -26083,12 +26083,14 @@ EOF
# Should be bumped along with EFL! # Should be bumped along with EFL!
pythonefl = buildPythonPackage rec { pythonefl = buildPythonPackage rec {
name = "python-efl-${version}"; name = "python-efl-${version}";
version = "1.19.0"; version = "1.20.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
sha256 = "105qykdd04mlyzwzyscw6mlc7ajl4wbwhq87ncy1jvw8jjh6jads"; sha256 = "18qfqdkkjydqjk0nxs7wnnzdnqlbj3fhkjm0bbd927myzbihxpkh";
}; };
hardeningDisable = [ "format" ];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
''; '';