From 71727f32a99b2a74654e3478bd78fd876c76f4f2 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 15 Apr 2019 23:03:30 +0100 Subject: rapid-photo-downloader: 0.9.13 -> 0.9.14 (#59347) This updates Rapid Photo Downloader to 0.9.14 and fixes #56815 Support for RAW images is not currently functioning; the rawkit bindings are unmaintained and only support libraw <= 0.18, but nixpkgs ships 0.19 --- .../graphics/rapid-photo-downloader/default.nix | 47 ++++++++++++++-------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 36087aa84bb3b..0f19a296df396 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev -, udisks, glib, gnome3, gst_all_1, libnotify -, exiv2, exiftool, qt5, gdk_pixbuf +, udisks, gexiv2, gst_all_1, libnotify +, exiftool, gdk_pixbuf, libmediainfo }: python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1517w18sxil1gwd78jjbbixcd1b0sp05imnnd5h5lr8wl3f0szj0"; + sha256 = "1nywkkyxlpzq3s9anza9k67j5689pfclfha218frih36qdb0j258"; }; # Disable version check and fix install tests @@ -19,24 +19,34 @@ python3Packages.buildPythonApplication rec { --replace "disable_version_check = False" "disable_version_check = True" substituteInPlace raphodo/rescan.py \ --replace "from preferences" "from raphodo.preferences" - substituteInPlace raphodo/copyfiles.py \ - --replace "import problemnotification" "import raphodo.problemnotification" ''; - nativeBuildInputs = [ file intltool gobject-introspection ]; + nativeBuildInputs = [ + file + intltool + ]; + + # Package has no generally usable unit tests. + # The included doctests expect specific, hardcoded hardware to be present. + doCheck = false; + # NOTE: Without gobject-introspection in buildInputs, launching fails with + # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ - libgudev - udisks - glib - gnome3.gexiv2 + gdk_pixbuf + gexiv2 + gobject-introspection + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gstreamer + gst_all_1.gstreamer.dev + libgudev libnotify - exiv2 - exiftool - qt5.qtimageformats - gdk_pixbuf - ] ++ (with python3Packages; [ + udisks + ]; + + propagatedBuildInputs = with python3Packages; [ pyqt5 pygobject3 gphoto2 @@ -54,11 +64,14 @@ python3Packages.buildPythonApplication rec { requests colorlog pyprind - ]); + ]; makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set PYTHONPATH \"$PYTHONPATH\"" + "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool ]}" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" + "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; meta = with stdenv.lib; { -- cgit 1.4.1