diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix new file mode 100644 index 00000000000..42afadc304d --- /dev/null +++ b/pkgs/development/libraries/libexif/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libexif-0.6.11"; + + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/libexif/libexif-0.6.11.tar.bz2; + md5 = "211996a336f1b1a06def5a6d5c94284e"; + }; + + patches = [./no-po.patch]; +} diff --git a/pkgs/development/libraries/libexif/no-po.patch b/pkgs/development/libraries/libexif/no-po.patch new file mode 100644 index 00000000000..7348b008528 --- /dev/null +++ b/pkgs/development/libraries/libexif/no-po.patch @@ -0,0 +1,20 @@ +diff -rc libexif-0.6.11-orig/Makefile.in libexif-0.6.11/Makefile.in +*** libexif-0.6.11-orig/Makefile.in 2004-10-16 14:21:37.000000000 +0200 +--- libexif-0.6.11/Makefile.in 2005-03-11 11:35:24.000000000 +0100 +*************** +*** 215,221 **** + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +! SUBDIRS = libexif libjpeg test po m4 + EXTRA_DIST = @PACKAGE@.spec + + ######################################################################## +--- 215,221 ---- + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +! SUBDIRS = libexif libjpeg test m4 + EXTRA_DIST = @PACKAGE@.spec + + ######################################################################## diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index f99f4f87a59..c5a185a4bcf 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -140,6 +140,10 @@ rec { inherit (xlibs) libXaw; }; + exif = (import ../tools/graphics/exif) { + inherit fetchurl stdenv pkgconfig libexif popt; + }; + hevea = (import ../tools/typesetting/hevea) { inherit fetchurl stdenv ocaml; }; @@ -606,6 +610,10 @@ rec { inherit fetchurl stdenv; }; + libexif = (import ../development/libraries/libexif) { + inherit fetchurl stdenv; + }; + popt = (import ../development/libraries/popt) { inherit fetchurl stdenv gettext; }; @@ -1123,6 +1131,13 @@ rec { inherit (gtkLibs) gtk; }; + /* + fspot = (import ../applications/graphics/f-spot) { + inherit fetchurl stdenv perl perlXMLParser pkgconfig mono; + inherit (gnome) libgnome libgnomeui; + }; + */ + hello = (import ../applications/misc/hello/ex-1) { inherit fetchurl stdenv perl; }; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix new file mode 100644 index 00000000000..8d682e81119 --- /dev/null +++ b/pkgs/tools/graphics/exif/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pkgconfig, libexif, popt}: + +stdenv.mkDerivation { + name = "exif-0.6.9"; + + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/libexif/exif-0.6.9.tar.gz; + md5 = "555029098386fa677c461eb249d852d7"; + }; + + buildInputs = [pkgconfig libexif popt]; +}