From 88f5f970b4b4599fcb2d8e8a1f12ae37880a810b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 5 Jun 2020 18:19:14 +0200 Subject: libjpeg_drop: remove The drop patches have been upstreamed to libjpeg 9d --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ff4051310745..76b8f919510c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -246,6 +246,7 @@ mapAliases ({ libgumbo = gumbo; # added 2018-01-21 libGL_driver = mesa.drivers; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 + libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblrdf = lrdf; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7f5bd5485b3..8f20eb0418f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13183,7 +13183,6 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; -- cgit 1.4.1