diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix deleted file mode 100644 index 22cb1b13589..00000000000 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, static ? true }: - -with stdenv.lib; - -stdenv.mkDerivation { - name = "libjpeg-drop-9b"; - - srcs = [ - (fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v9b.tar.gz"; - sha256 = "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4"; - }) - (fetchurl { - url = "http://jpegclub.org/droppatch.v9b.tar.gz"; - sha256 = "022bnvpird7w5pwbfqpq7j7pwja5kp6x9k3sdypcy3g2nwwy2wwk"; - }) - ]; - - postUnpack = '' - rm jpegtran - mv jpegtran.c jpeg-9b/jpegtran.c - mv transupp.c jpeg-9b/transupp.c - mv transupp.h jpeg-9b/transupp.h - ''; - - configureFlags = [] - ++ optionals static [ "--enable-static" "--disable-shared" ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - meta = { - homepage = "http://jpegclub.org/jpegtran/"; - description = "Experimental lossless crop 'n' drop (cut & paste) patches for libjpeg"; - license = stdenv.lib.licenses.free; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1004a444469..03b03ff2a84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -247,6 +247,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 bd298ce24ea..dc2a3d436dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13184,7 +13184,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 { };