diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/by-name/vy/vym/package.nix similarity index 75% rename from pkgs/applications/misc/vym/default.nix rename to pkgs/by-name/vy/vym/package.nix index 8a550ac4a79f..bafae7dad58e 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/by-name/vy/vym/package.nix @@ -1,17 +1,23 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, pkg-config -, qtbase -, qtscript -, qtsvg -, substituteAll -, unzip -, wrapQtAppsHook -, zip +{ + lib, + cmake, + fetchFromGitHub, + pkg-config, + qt5, + stdenv, + substituteAll, + unzip, + zip, }: +let + inherit (qt5) + qtbase + qtscript + qtsvg + wrapQtAppsHook + ; +in stdenv.mkDerivation (finalAttrs: { pname = "vym"; version = "2.9.26"; @@ -23,13 +29,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ (substituteAll { - src = ./000-fix-zip-paths.diff; - zipPath = "${zip}/bin/zip"; - unzipPath = "${unzip}/bin/unzip"; + src = ./patches/0000-fix-zip-paths.diff; + zipPath = "${lib.getExe zip}"; + unzipPath = "${lib.getExe unzip}"; }) ]; @@ -45,16 +54,20 @@ stdenv.mkDerivation (finalAttrs: { qtsvg ]; - strictDeps = true; - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + unzip + zip + ] + }" ]; + strictDeps = true; + meta = { homepage = "http://www.insilmaril.de/vym/"; description = "Mind-mapping software"; - mainProgram = "vym"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. Such maps can help you to improve your creativity and @@ -67,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { work with such maps. ''; license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "vym"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/misc/vym/000-fix-zip-paths.diff b/pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff similarity index 100% rename from pkgs/applications/misc/vym/000-fix-zip-paths.diff rename to pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5add59b17743..bda58a57c3ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33313,8 +33313,6 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = libsForQt5.callPackage ../applications/misc/vym { }; - wad = callPackage ../tools/security/wad { }; wafw00f = callPackage ../tools/security/wafw00f { };