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

calibre: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:28:02 -06:00
parent e292103d46
commit 36dea909b7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/calibre/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite , imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite
, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
, xdg_utils , xdg_utils
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
fontconfig podofo qt5.base chmlib icu sqlite libusb1 libmtp xdg_utils fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw

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

@ -11156,7 +11156,7 @@ let
calcurse = callPackage ../applications/misc/calcurse { }; calcurse = callPackage ../applications/misc/calcurse { };
calibre = callPackage ../applications/misc/calibre { calibre = qt5.callPackage ../applications/misc/calibre {
inherit (pythonPackages) pyqt5 sip_4_16; inherit (pythonPackages) pyqt5 sip_4_16;
}; };