From 5e28bf0bdefc502ed041bf36bcaeb8681804815e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 5 Feb 2013 10:32:34 +0100 Subject: Use libjpeg-turbo as the system-wide default. ToDo: open an issue for discussion (testing, easy to revert). --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68a46f64a88b..33503f65b3dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4339,9 +4339,9 @@ let libiptcdata = callPackage ../development/libraries/libiptcdata { }; - libjpeg = callPackage ../development/libraries/libjpeg { }; - + libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg = libjpeg_turbo; libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; -- cgit 1.4.1