diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-07-17 14:19:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 14:19:21 +0200 |
| commit | 42cdad0a03494eb044aeaee8d8901f68e9bb7a8f (patch) | |
| tree | 2960c6c2395225d64d884291a16a50995ecb18ea | |
| parent | 567b84dd50f9800f8563793946ca6fb99dc71777 (diff) | |
| parent | 56743ea677fbdb50e2ae18988ddcb729c24c7cd3 (diff) | |
| download | nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.tar nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.tar.gz nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.tar.bz2 nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.tar.lz nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.tar.xz nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.tar.zst nixlib-42cdad0a03494eb044aeaee8d8901f68e9bb7a8f.zip | |
Merge pull request #27290 from calvertvl/fix_calibre_html5lib
calibre: fix html5lib error
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 37cb027aa36c..8341898fa233 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ - src/{chardet,cherrypy,odf,routes} + src/{chardet,cherrypy,html5lib,odf,routes} ''; dontUseQmakeConfigure = true; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ + html5lib_0_9999999 # needs to be before mechanize ? apsw cssselect cssutils dateutil lxml mechanize netifaces pillow python pyqt5 sip regex msgpack |