From c59c1f9fe027df49a248aea5692b45f9ea598537 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 27 Feb 2016 13:51:57 +0100
Subject: e19.efl: remove the openjpeg override

/cc #12599, discussed on:
https://github.com/NixOS/nixpkgs/pull/12599/files#r50664194
---
 pkgs/desktops/e19/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix
index 4f319159bcc9..b285498be9dc 100644
--- a/pkgs/desktops/e19/default.nix
+++ b/pkgs/desktops/e19/default.nix
@@ -1,16 +1,7 @@
 { callPackage, pkgs }:
-let
-  openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: rec {
-         name = "openjpeg-1.5.2";
-         src = fetchurl {
-           url = "mirror://sourceforge/openjpeg.mirror/${name}.tar.gz";
-           sha1 = "lahbqvjpsfdxsrm0wsy3pdrp3pzrjvj9";
-         };
-     });
-in
 rec {
   #### CORE EFL
-  efl = callPackage ./efl.nix { openjpeg=openjpeg_1; };
+  efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
   evas = callPackage ./evas.nix { };
   emotion = callPackage ./emotion.nix { };
   elementary = callPackage ./elementary.nix { };
-- 
cgit 1.4.1