diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 35b9200a4774..374b245e2499 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -7,7 +7,7 @@ , qtbase , qmake , git -, libpng_apng +, libpng , pkg-config , wrapQtAppsHook , stdenv @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libarchive libusb-compat-0_1 qtbase - libpng_apng + libpng ]; qmakeFlags = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 818b8118d434..70e3bd958aaf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -601,6 +601,7 @@ mapAliases ({ liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; + libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 librdf = lrdf; # Added 2020-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f815ac292c6..18a07c1875a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18694,7 +18694,6 @@ with pkgs; libplacebo = callPackage ../development/libraries/libplacebo { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpostal = callPackage ../development/libraries/libpostal { }; @@ -25958,7 +25957,6 @@ with pkgs; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; - libpng = libpng_apng; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox @@ -29444,7 +29442,6 @@ with pkgs; thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; - libpng = libpng_apng; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox