From e70753075144d29389291436d4b5867f051a18ab Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 2 Oct 2014 01:40:20 +0200 Subject: [PATCH] giflib: add back the 5.0 version Should fix tracker and may be used to fix other packages after commit 61f8cee. Untested as it takes too much time to recompile everything these days. --- pkgs/desktops/gnome-3/3.10/default.nix | 2 +- pkgs/desktops/gnome-3/3.12/default.nix | 2 +- pkgs/development/libraries/giflib/5.0.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/giflib/5.0.nix diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index 89e16490df9..e1783be3b7f 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -132,7 +132,7 @@ rec { totem-pl-parser = callPackage ./core/totem-pl-parser { }; - tracker = callPackage ./core/tracker { }; + tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; vte = callPackage ./core/vte { }; diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a2ac4a94593..a46f49cbb5a 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -164,7 +164,7 @@ rec { totem-pl-parser = callPackage ./core/totem-pl-parser { }; - tracker = callPackage ./core/tracker { }; + tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; vte = callPackage ./core/vte { }; diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix new file mode 100644 index 00000000000..4dc8132805c --- /dev/null +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: + +stdenv.mkDerivation { + name = "giflib-5.0.5"; + src = fetchurl { + url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2; + sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0"; + }; + + buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd19493ce3e..e6ce829488b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5868,6 +5868,7 @@ let giflib = callPackage ../development/libraries/giflib { }; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; + giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { };