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

efl: add version 1.20.2

Browse Source 
- Add the new version 1.20.2.

- Keep version 1.19.1 for now because ephoto still needs it. As soon
  as a new release o ephoto which works with efl-1.20.x is availaible,
  efl-1.19.x may be removed.
This commit is contained in:
romildo 2017-08-17 12:11:02 -03:00
parent 53bd6cf417
commit 0fb920b474
2 changed files with 9 additions and 3 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 ];