ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-08 14:40:07 +03:00
Code Issues Projects Releases Wiki Activity

poppler: normalize package name to upstream

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:50:40 -06:00
parent 17e17ea649
commit e782026719
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix
View File

@ -1,11 +1,11 @@
{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 { kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib , ffmpeg, karchive, ki18n, poppler, qtbase, taglib
}: }:
kdeFramework { kdeFramework {
name = "kfilemetadata"; name = "kfilemetadata";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
propagatedBuildInputs = [ qtbase ki18n ]; propagatedBuildInputs = [ qtbase ki18n ];
meta = { meta = {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

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

@ -8071,8 +8071,6 @@ let
suffix = "qt4"; suffix = "qt4";
}; };
poppler_qt5 = qt5Libs.popplerQt;
poppler_utils = poppler.override { suffix = "utils"; utils = true; }; poppler_utils = poppler.override { suffix = "utils"; utils = true; };
popt = callPackage ../development/libraries/popt { }; popt = callPackage ../development/libraries/popt { };
@ -8173,7 +8171,7 @@ let
withQt5 = true; withQt5 = true;
}; };
popplerQt = callPackage ../development/libraries/poppler { poppler = callPackage ../development/libraries/poppler {
lcms = lcms2; lcms = lcms2;
qt5Support = true; qt5Support = true;
suffix = "qt5"; suffix = "qt5";
@ -15805,6 +15803,7 @@ aliases = with self; rec {
nfsUtils = nfs-utils; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06
phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5 = qt5.phonon; # added 2015-12-19
phonon_qt5_backend_gstreamer = qt5.phonon_backend_gstreamer; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon_backend_gstreamer; # added 2015-12-19
poppler_qt5 = qt5Libs.poppler; # added 2015-12-19
qca-qt5 = qt5.qca-qt5; # added 2015-12-19 qca-qt5 = qt5.qca-qt5; # added 2015-12-19
quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30
quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30