about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-02-05 10:32:34 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-02-05 10:32:34 +0100
commit5e28bf0bdefc502ed041bf36bcaeb8681804815e (patch)
tree10b33978c5db426070a160078fcc5786cbe0afa0
parent7943a3c648f54a4a9b73e5eed627dbb030e2ea79 (diff)
downloadnixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.tar
nixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.tar.gz
nixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.tar.bz2
nixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.tar.lz
nixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.tar.xz
nixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.tar.zst
nixlib-5e28bf0bdefc502ed041bf36bcaeb8681804815e.zip
Use libjpeg-turbo as the system-wide default.
ToDo: open an issue for discussion (testing, easy to revert).
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files 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;