From 0fb920b4749f6bc3b0ed718bce860eb442920516 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 17 Aug 2017 12:11:02 -0300
Subject: efl: add version 1.20.2

- 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.
---
 pkgs/desktops/enlightenment/default.nix | 3 ++-
 pkgs/desktops/enlightenment/efl.nix     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'pkgs/desktops/enlightenment')

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index a8b5e08abd65..c132f565632c 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -2,6 +2,7 @@
 rec {
   #### CORE EFL
   efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
+  efl_1_19 = callPackage ./efl.nix { eflVersion = "1.19.1"; openjpeg = pkgs.openjpeg_1; };
 
   #### WINDOW MANAGER
   enlightenment = callPackage ./enlightenment.nix { };
@@ -10,5 +11,5 @@ rec {
   econnman = callPackage ./econnman.nix { };
   terminology = callPackage ./terminology.nix { };
   rage = callPackage ./rage.nix { };
-  ephoto = callPackage ./ephoto.nix { };
+  ephoto = callPackage ./ephoto.nix { efl = efl_1_19; };
 }
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index e9302fca674b..00980d4a94d1 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -4,15 +4,20 @@
 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
 , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
 , 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 {
   name = "efl-${version}";
-  version = "1.19.1";
+  version = eflVersion;
 
   src = fetchurl {
     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 ];
-- 
cgit 1.4.1