diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-21 04:44:40 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-21 04:44:40 +0200 |
commit | 6bbc3a0b245ccf392a8ddbce41b372c17409f0e9 (patch) | |
tree | 7c76fd40defb9e9907c2b352f9cb98874a84eca0 /pkgs/applications/misc | |
parent | 96457d26dded05bcba8e9fbb9bf0255596654aab (diff) | |
parent | 3b29468313bc8604fe8f85c8d9316fd276d3985c (diff) | |
download | nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.gz nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.bz2 nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.lz nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.xz nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.zst nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.zip |
Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/misc/moonlight-embedded/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/xrq/default.nix | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8341898fa233..6ca457cc1d37 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.3.0"; + version = "3.5.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c"; + sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv"; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ - src/{chardet,cherrypy,html5lib,odf,routes} + src/odf ''; dontUseQmakeConfigure = true; @@ -49,12 +49,11 @@ 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 + apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead - chardet cherrypy odfpy routes + odfpy ]); installPhase = '' @@ -91,6 +90,9 @@ stdenv.mkDerivation rec { substituteAllInPlace $entry done + mkdir -p $out/share + cp -a man-pages $out/share/man + runHook postInstall ''; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 894751571ecf..c95f935b8555 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ cmake perl ]; buildInputs = [ diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 914dc3351456..da5f3c3bf128 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' # Don't remove mujs because upstream version is incompatible diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index c0c5616db79a..fe65004b32ae 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make PREFIX=$out install ''; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; buildInputs = [ libX11 ]; |