diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
| commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
| tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/games | |
| parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
| parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
| download | nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/construo/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/games/exult/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/newtonwars/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/trackballs/default.nix | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 7db641367311..38a67289d391 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; homepage = http://fs.fsf.org/construo/; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 66e199a3f0d2..b444f5b0be0f 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,15 +5,16 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; + sha256 = "1bzhqrc944rgpdnnid3c5h2r3dvyw70cs70hazzm0cv5aipdkhbl"; }; + # Patch hard-coded paths in the makefile patches = [ ./crawl_purify.patch ]; nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; @@ -25,9 +26,7 @@ stdenv.mkDerivation rec { preBuild = '' cd crawl-ref/source echo "${version}" > util/release_ver - for i in util/*; do - patchShebangs $i - done + patchShebangs 'util' patchShebangs util/gen-mi-enum rm -rf contrib ''; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 17469777ea41..a90e50fac629 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 0fe9d1ee0f57..c806dfa5b806 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { description = "A space battle game with gravity as the main theme"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 06bd2a8bc4d0..8549a860d8e8 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = https://trackballs.github.io/; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } |