diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:06:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:06:01 +0200 |
| commit | 36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64 (patch) | |
| tree | 3fc41497f5bfdb4683080bd7c7d8e412fb6aadc4 /pkgs/applications/misc | |
| parent | afa9962538b12237f5a4604017fe9c0914404800 (diff) | |
| parent | c7d25a5db6beb915be4dd714821f342fab7980a2 (diff) | |
| download | nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.gz nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.bz2 nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.lz nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.xz nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.zst nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/joplin-desktop/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/qmapshack/default.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 3c84588530cc..6515b3132d27 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.201"; + version = "1.0.216"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "060dkgamsv59vgslqyjfh1g8wg3nldrvfb9lf0y9sxjlbsv8bc55"; + sha256 = "17rb7h98h9i2p5kw5gznx5swpz6yxqdxwc9x5cgbkc31vk10iszn"; }; @@ -42,7 +42,7 @@ in appimageTools.wrapType2 rec { ''; homepage = "https://joplinapp.org"; license = licenses.mit; - maintainers = with maintainers; [ hugoreeves rafaelgg raquelgb ]; + maintainers = with maintainers; [ hugoreeves ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index a3238f7cba47..edb5a9b37889 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -29,6 +29,10 @@ mkDerivation rec { "${src}/FindQuaZip5.patch" ]; + qtWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}" + ]; + meta = with lib; { homepage = "https://github.com/Maproom/qmapshack"; description = "Consumer grade GIS software"; |