Fix Ufraw.

svn path=/nixpkgs/trunk/; revision=18510

2 files changed, 3 insertions, 171 deletions

diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 3787d36007f5..21d5c3ada864 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -5,13 +5,11 @@ stdenv.mkDerivation rec {
   name = "ufraw-0.16";
 
   src = fetchurl {
+    # XXX: These guys appear to mutate uploaded tarballs!
     url = "mirror://sourceforge/ufraw/${name}.tar.gz";
-    sha256 = "0d3hd04msdk6l0nv1n8zs3ybipy3jikli57d9q41pb7v0hnl6hzd";
+    sha256 = "06fzyd7wyv5ixbmhbsz80pphhbic18d1w8ji0gz38aq1vdmgxw9n";
   };
 
-  patches = [ ./mkinstalldirs.patch ];
-  preConfigure = "chmod +x mkinstalldirs";
-
   buildInputs =
     [ pkgconfig gtk gtkimageview gettext bzip2 zlib
       libjpeg libtiff cfitsio exiv2 lcms
@@ -35,5 +33,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # needs GTK+
   };
 }
diff --git a/pkgs/applications/graphics/ufraw/mkinstalldirs.patch b/pkgs/applications/graphics/ufraw/mkinstalldirs.patch
deleted file mode 100644
index 339d4c110419..000000000000
--- a/pkgs/applications/graphics/ufraw/mkinstalldirs.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-Add the missing GNU `mkinstalldirs' script, taken from Gnulib.
-
---- /dev/null	2009-10-19 13:42:41.176006468 +0200
-+++ ufraw/mkinstalldirs	2009-06-26 22:10:56.000000000 +0200
-@@ -0,0 +1,162 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
-+errstatus=0
-+dirmode=
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake@gnu.org>."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
-+
-+for file
-+do
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
-+case $dirmode in
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
-+esac
-+
-+for file
-+do
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
-+	  fi
-+	fi
-+      fi
-+    fi
-+
-+    pathcomp=$pathcomp/
-+  done
-+done
-+
-+exit $errstatus
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End: