From 4effe769e2b892aa2d406486b2800e4309b565af Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 23 Oct 2020 22:40:06 +0000 Subject: [PATCH] libraw: 0.20.0 -> 0.20.2 Reapplying the commit from PR #101508 merge, without staging changes. (cherry picked from commit 0594e27df32346d3953d3f025d283451bfd7561a) --- pkgs/development/libraries/libraw/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index b190d36acb52..f59f63c38ac7 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, lcms2, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: stdenv.mkDerivation rec { pname = "libraw"; - version = "0.20.0"; + version = "0.20.2"; - src = fetchurl { - url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; + src = fetchFromGitHub { + owner = "LibRaw"; + repo = "LibRaw"; + rev = version; + sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; }; outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; }