JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #165171 from helsinki-systems/drop/libpng_apng

Browse Source
This commit is contained in:
Sandro 2022-03-23 03:49:51 +01:00 committed by GitHub
commit 1c085fde6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/math/cemu/default.nix
View File

@ -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 = [

1
pkgs/top-level/aliases.nix
View File

@ -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

3
pkgs/top-level/all-packages.nix
View File

@ -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