Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0f11e27d6c1c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bedf58b78f9b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 20, 2021

  1. unciv: init at 3.12.8

    @tex
    tex committed Jan 20, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dhess Drew Hess
    GPG key ID: 4DC0BBFBE3FEF428
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    52a7a2d View commit details

Commits on Jan 22, 2021

  1. Merge pull request #91123 from tex/unciv

    @SuperSandro2000
    SuperSandro2000 authored Jan 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bedf58b View commit details
Showing with 61 additions and 0 deletions.
  1. +59 −0 pkgs/games/unciv/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
59 changes: 59 additions & 0 deletions pkgs/games/unciv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{ stdenv
, lib
, fetchurl
, copyDesktopItems
, makeDesktopItem
, makeWrapper
, jre
, libpulseaudio
, libXxf86vm
}:
let
desktopItem = makeDesktopItem {
name = "unciv";
exec = "unciv";
comment = "An open-source Android/Desktop remake of Civ V";
desktopName = "Unciv";
categories = "Game;";
};

envLibPath = lib.makeLibraryPath [
libpulseaudio
libXxf86vm
];

in
stdenv.mkDerivation rec {
pname = "unciv";
version = "3.12.8";

src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7";
};

dontUnpack = true;

nativeBuildInputs = [ copyDesktopItems makeWrapper ];

installPhase = ''
runHook preInstall
makeWrapper ${jre}/bin/java $out/bin/unciv \
--prefix LD_LIBRARY_PATH : ${envLibPath} \
--prefix PATH : ${lib.makeBinPath [ jre ]} \
--add-flags "-jar ${src}"
runHook postInstall
'';

desktopItems = [ desktopItem ];

meta = with lib; {
description = "An open-source Android/Desktop remake of Civ V";
homepage = "https://github.com/yairm210/Unciv";
maintainers = with maintainers; [ tex ];
license = licenses.mpl20;
platforms = [ "x86_64-linux" ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -26973,6 +26973,8 @@ in
ffmpeg = ffmpeg_2;
};

unciv = callPackage ../games/unciv { };

unnethack = callPackage ../games/unnethack { };

uqm = callPackage ../games/uqm { };