From 51fdc6e2385116bf28cb21c1b94b025b1c4055f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Jan 2015 16:55:58 +0100 Subject: [PATCH] libjpeg-turbo: major update, and populate meta TODO: also some darwin packaging improvements were in the news. Maybe it would be suitable to have this as the default libjpeg in there. --- pkgs/development/libraries/libjpeg-turbo/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 07f3d65ffc1..6a650de8564 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-1.3.1"; + name = "libjpeg-turbo-1.4.0"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "1fbgcvlnn3d5gvf0v9jnlcabpv2z3nwxclzyabahxi6x2xs90cn1"; + sha256 = "1vmv5ciqq98gi2ishqbvlx9hsk7sl06lr6xkcgw480jiddadhfnr"; }; buildInputs = [ nasm ]; @@ -13,9 +13,12 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - meta = { + meta = with stdenv.lib; { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; - license = stdenv.lib.licenses.free; + license = licenses.ijg; # and some parts under other BSD-style licenses + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; } +