prevo: adjust wrapper, loosen platforms

- add man to PATH
- allow XDG_DATA_DIRS to be overriden at runtime
- unset platform on data and link package, change linux to unix
- add a maintainer

3 files changed, 17 insertions, 15 deletions

diff --git a/pkgs/by-name/pr/prevo-data/package.nix b/pkgs/by-name/pr/prevo-data/package.nix
index efd19d7745ca..c73af66dd69c 100644
--- a/pkgs/by-name/pr/prevo-data/package.nix
+++ b/pkgs/by-name/pr/prevo-data/package.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, prevo-tools }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "prevo-data";
   version = "2020-03-08";
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp prevo.db $out/share/prevo/
   '';
 
-  meta = with lib; {
+  meta = {
     description =
       "data for offline version of the Esperanto dictionary Reta Vortaro";
     longDescription = ''
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
       This package provides the ReVo database for the prevo command line application.
     '';
     homepage = "https://github.com/bpeel/revo";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.das-g ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ das-g ehmry ];
   };
 }
diff --git a/pkgs/by-name/pr/prevo-tools/package.nix b/pkgs/by-name/pr/prevo-tools/package.nix
index 508f085bb44b..4feb518103d4 100644
--- a/pkgs/by-name/pr/prevo-tools/package.nix
+++ b/pkgs/by-name/pr/prevo-tools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     installShellCompletion --bash src/prevo-completion
   '';
 
-  meta = with lib; {
+  meta = {
     description =
       "CLI tools for the offline version of the Esperanto dictionary Reta Vortaro";
     longDescription = ''
@@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
       database for this application or for the Android app of the same name.
     '';
     homepage = "https://github.com/bpeel/prevodb";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.das-g ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    mainProgram = "prevo";
+    maintainers = with lib.maintainers; [ das-g ehmry ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/pr/prevo/package.nix b/pkgs/by-name/pr/prevo/package.nix
index 45f5889d4d5d..5a0ecff4d885 100644
--- a/pkgs/by-name/pr/prevo/package.nix
+++ b/pkgs/by-name/pr/prevo/package.nix
@@ -1,4 +1,4 @@
-{ lib, symlinkJoin, prevo-tools, prevo-data, makeWrapper }:
+{ lib, symlinkJoin, man, prevo-tools, prevo-data, makeWrapper }:
 
 symlinkJoin rec {
   name = "prevo-${version}";
@@ -10,18 +10,20 @@ symlinkJoin rec {
 
   postBuild = ''
     wrapProgram $out/bin/prevo \
-      --prefix XDG_DATA_DIRS : "${prevo-data}/share"
+      --prefix PATH ":" "${lib.makeBinPath [ man ]}" \
+      --suffix XDG_DATA_DIRS : "${prevo-data}/share" \
+
   '';
 
-  meta = with lib; {
+  meta = {
     description = "offline version of the Esperanto dictionary Reta Vortaro";
     longDescription = ''
       PReVo is the "portable" ReVo, i.e., the offline version
       of the Esperanto dictionary Reta Vortaro.
     '';
     homepage = "https://github.com/bpeel/prevodb";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.das-g ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    mainProgram = "prevo";
+    maintainers = with lib.maintainers; [ das-g ehmry ];
   };
 }