public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjpeg(-turbo): maintenance update 1.4.1 -> 1.4.2

Browse Source
This commit is contained in:
Vladimír Čunát 2015-09-23 12:20:33 +02:00
parent 23f75e9bb0
commit 9de8f95d4b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, nasm }: { stdenv, fetchurl, nasm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libjpeg-turbo-1.4.1"; name = "libjpeg-turbo-1.4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "027vz97064bjmwj7gdw2p47y1437w08j54frpgzmnql5rvabmxab"; sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj";
}; };
buildInputs = [ nasm ]; buildInputs = [ nasm ];

2
pkgs/top-level/all-packages.nix
View File

@ -7081,7 +7081,7 @@ let
libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_original = callPackage ../development/libraries/libjpeg { };
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix {
libtool = libtool_1_5; libtool = libtool_1_5;