From a9ac651764341c8789ceac2d6b649cac7856679f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 May 2018 21:07:28 -0500 Subject: [PATCH] libjpeg: always use libjpeg_turbo 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! --- pkgs/development/libraries/libjpeg-turbo/default.nix | 3 --- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 4ec0e5ebd9f..e4f70b792fd 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -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; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3a71edbb6b..9ef98ef0e46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };