vym: nixfmt-rfc-style and hammer

- use lib.getExe
- put patches on a dedicated directory

+32 -18
pkgs/applications/misc/vym/000-fix-zip-paths.diff pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff
+32 -18
pkgs/applications/misc/vym/default.nix
··· 1 - { lib 2 - , stdenv 3 - , cmake 4 - , fetchFromGitHub 5 - , pkg-config 6 - , substituteAll 7 - , unzip 8 - , zip 9 - , qt5 1 + { 2 + lib, 3 + cmake, 4 + fetchFromGitHub, 5 + pkg-config, 6 + qt5, 7 + stdenv, 8 + substituteAll, 9 + unzip, 10 + zip, 10 11 }: 11 12 12 13 let 13 - inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook; 14 + inherit (qt5) 15 + qtbase 16 + qtscript 17 + qtsvg 18 + wrapQtAppsHook 19 + ; 14 20 in 15 21 stdenv.mkDerivation (finalAttrs: { 16 22 pname = "vym"; ··· 23 29 hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M="; 24 30 }; 25 31 26 - outputs = [ "out" "man" ]; 32 + outputs = [ 33 + "out" 34 + "man" 35 + ]; 27 36 28 37 patches = [ 29 38 (substituteAll { 30 - src = ./000-fix-zip-paths.diff; 31 - zipPath = "${zip}/bin/zip"; 32 - unzipPath = "${unzip}/bin/unzip"; 39 + src = ./patches/0000-fix-zip-paths.diff; 40 + zipPath = "${lib.getExe zip}"; 41 + unzipPath = "${lib.getExe unzip}"; 33 42 }) 34 43 ]; 35 44 ··· 45 54 qtsvg 46 55 ]; 47 56 48 - strictDeps = true; 49 - 50 57 qtWrapperArgs = [ 51 - "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}" 58 + "--prefix PATH : ${ 59 + lib.makeBinPath [ 60 + unzip 61 + zip 62 + ] 63 + }" 52 64 ]; 53 65 66 + strictDeps = true; 67 + 54 68 meta = { 55 69 homepage = "http://www.insilmaril.de/vym/"; 56 70 description = "Mind-mapping software"; 57 - mainProgram = "vym"; 58 71 longDescription = '' 59 72 VYM (View Your Mind) is a tool to generate and manipulate maps which show 60 73 your thoughts. Such maps can help you to improve your creativity and ··· 67 80 work with such maps. 68 81 ''; 69 82 license = with lib.licenses; [ gpl2Plus ]; 83 + mainProgram = "vym"; 70 84 maintainers = with lib.maintainers; [ AndersonTorres ]; 71 85 platforms = lib.platforms.linux; 72 86 };