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

libjpeg: always use libjpeg_turbo

Browse Source 
libjpeg_turbo is consistently built on Darwin now. I have no way to
verify FreeBSD so if anyone can confirm libjpeg_turbo is still broken
please revert this!
This commit is contained in:
Matthew Bauer 2018-05-10 21:07:28 -05:00
parent 67db915a43
commit a9ac651764
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
description = "A faster (using SIMD) libjpeg implementation";
license = licenses.ijg; # and some parts under other BSD-style licenses
maintainers = [ maintainers.vcunat ];
# upstream supports darwin (and others), but it doesn't build currently
platforms = platforms.all;
hydraPlatforms = platforms.linux;
};
}

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

@ -10143,7 +10143,7 @@ with pkgs;
libjpeg_original = callPackage ../development/libraries/libjpeg { };
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
libjpeg = libjpeg_turbo;
libjreen = callPackage ../development/libraries/libjreen { };