From e78202671990320515ffca82c89d2aa079baea9b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:50:40 -0600 Subject: [PATCH] poppler: normalize package name to upstream --- .../libraries/kde-frameworks-5.17/kfilemetadata.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix index 92ca1f26b93..be99c58d550 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib +, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: kdeFramework { name = "kfilemetadata"; 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 ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39c110d1e4b..cbe6fc553c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8071,8 +8071,6 @@ let suffix = "qt4"; }; - poppler_qt5 = qt5Libs.popplerQt; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; @@ -8173,7 +8171,7 @@ let withQt5 = true; }; - popplerQt = callPackage ../development/libraries/poppler { + poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5Support = true; suffix = "qt5"; @@ -15805,6 +15803,7 @@ aliases = with self; rec { nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # 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 quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30