From 6f96ae757de88295289fe7724ef1c505560b8125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@vicerveza.homeunix.net> Date: Tue, 7 Apr 2009 19:17:22 +0000 Subject: [PATCH] Adding dcraw again, this time with the whole nix expression. svn path=/nixpkgs/trunk/; revision=14917 --- pkgs/tools/graphics/dcraw/default.nix | 29 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/graphics/dcraw/default.nix diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix new file mode 100644 index 000000000000..d69acd9168b2 --- /dev/null +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, libjpeg, lcms, gettext }: + +stdenv.mkDerivation { + name = "dcraw-8.93"; + + src = fetchurl { + url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.93.tar.gz; + sha256 = "1vjqfpqr0pczrf8ap3jpar1f98gik9is9v34sv1ridcxx87rniqz"; + }; + + buildInputs = [ libjpeg lcms gettext ]; + + patchPhase = '' + sed -i -e s@/usr/local@$out@ install + ''; + + buildPhase = '' + ensureDir $out/bin + set +e + sh install + set -e + ''; + + meta = { + homepage = http://www.cybercom.net/~dcoffin/dcraw/; + description = "Decoder for many camera raw picture formats"; + license = "free"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 634e6cebb8ab..e37ca7d48fae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -558,11 +558,9 @@ let inherit fetchurl stdenv zlib bzip2 openssl; }; - /* dcraw = import ../tools/graphics/dcraw { inherit fetchurl stdenv gettext libjpeg lcms; }; - */ ddrescue = builderDefsPackage (selectVersion ../tools/system/ddrescue "1.8") {};