diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/by-name/vm/vms-empire/package.nix similarity index 70% rename from pkgs/games/vms-empire/default.nix rename to pkgs/by-name/vm/vms-empire/package.nix index 9da37789f7cd..157d834ef914 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/by-name/vm/vms-empire/package.nix @@ -8,23 +8,34 @@ , installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vms-empire"; - version = "1.16"; + version = "1.17"; src = fetchurl{ - url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-XETIbt/qVU+TpamPc2WQynqqUuZqkTUnItBprjg+gPk="; + url = "http://www.catb.org/~esr/vms-empire/vms-empire-${finalAttrs.version}.tar.gz"; + hash = "sha256-AmHs6ojVcfglvvFvC9JzNWVS2t4Coqg8WwyNCM+sEno="; }; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ - ncurses + nativeBuildInputs = [ + installShellFiles xmlto docbook_xml_dtd_44 docbook_xsl ]; + buildInputs = [ + ncurses + ]; + + outputs = [ + "out" + "doc" + "man" + ]; + + strictDeps = true; + postBuild = '' xmlto man vms-empire.xml xmlto html-nochunks vms-empire.xml @@ -33,7 +44,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall install -D vms-empire -t ${placeholder "out"}/bin/ - install -D vms-empire.html -t ${placeholder "out"}/share/doc/${pname}/ + install -D vms-empire.html -t ${placeholder "doc"}/share/doc/vms-empire/ install -D vms-empire.desktop -t ${placeholder "out"}/share/applications/ install -D vms-empire.png -t ${placeholder "out"}/share/icons/hicolor/48x48/apps/ install -D vms-empire.xml -t ${placeholder "out"}/share/appdata/ @@ -41,12 +52,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - hardeningDisable = [ "format" ]; - - meta = with lib; { + meta = { homepage = "http://catb.org/~esr/vms-empire/"; description = "The ancestor of all expand/explore/exploit/exterminate games"; - mainProgram = "vms-empire"; longDescription = '' Empire is a simulation of a full-scale war between two emperors, the computer and you. Naturally, there is only room for one, so the object of @@ -55,8 +63,9 @@ stdenv.mkDerivation rec { expand/explore/exploit/exterminate games, including Civilization and Master of Orion. ''; - license = licenses.gpl2Only; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + mainProgram = "vms-empire"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38f50b2b0957..b91d237f8cdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37451,8 +37451,6 @@ with pkgs; vitetris = callPackage ../games/vitetris { }; - vms-empire = callPackage ../games/vms-empire { }; - voxelands = callPackage ../games/voxelands { }; vvvvvv = callPackage ../by-name/vv/vvvvvv/package.nix {