diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/applications/graphics/rapid-photo-downloader | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/rapid-photo-downloader')
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 28d05480dae1..2e12e18a5a53 100644 --- a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.16"; + version = "0.9.17"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0ij3li17jcqjx79ldv6zg2ckn8m2l9n4xvvq2x79y4q8yx9fqg85"; + sha256 = "10vqbi9rcg8r0jxpx2kn8xmahwgdcal28wpix2fg6nkp5rfwxnr6"; }; # Disable version check and fix install tests @@ -67,14 +67,16 @@ mkDerivationWith python3Packages.buildPythonApplication rec { tenacity ]; - makeWrapperArgs = [ - "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" - "--set PYTHONPATH \"$PYTHONPATH\"" - "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" - "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" - "\${qtWrapperArgs[@]}" - ]; + preFixup = '' + makeWrapperArgs+=( + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" + --set PYTHONPATH "$PYTHONPATH" + --prefix PATH : "${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libmediainfo ]}" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + "''${qtWrapperArgs[@]}" + ) + ''; meta = with stdenv.lib; { description = "Photo and video importer for cameras, phones, and memory cards"; |