diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 13:00:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:16:54 +0200 |
| commit | 1e389c976cc5326b08bd166785e643364bb2d8b4 (patch) | |
| tree | 58f51874e758fb2f6412f1d15717a5cfe1a8fb01 /pkgs/games | |
| parent | a8fc68a5c02488a2228a1dc4984a3fa6351002eb (diff) | |
| parent | 773595540bd3a52476a7c84799e374d086d1c648 (diff) | |
merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/Allure/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/games/LambdaHack/default.nix | 16 |
2 files changed, 25 insertions, 10 deletions
diff --git a/pkgs/games/Allure/default.nix b/pkgs/games/Allure/default.nix new file mode 100644 index 0000000000000..532ef092f0945 --- /dev/null +++ b/pkgs/games/Allure/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, enummapsetTh, filepath, LambdaHack, text }: + +cabal.mkDerivation (self: { + pname = "Allure"; + version = "0.4.99.0"; + sha256 = "1i4v1h4ynx4aap0nmf8qn2qx22wqfgypr83l7bh38fd4qibsvx3q"; + isLibrary = false; + isExecutable = true; + buildDepends = [ enummapsetTh filepath LambdaHack text ]; + testDepends = [ enummapsetTh filepath LambdaHack text ]; + meta = { + homepage = "http://allureofthestars.com"; + description = "Near-future Sci-Fi roguelike and tactical squad game"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 00172b840c45c..eb4edf2b36a9f 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -3,13 +3,13 @@ { cabal, assertFailure, async, binary, deepseq, enummapsetTh , filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow , random, stm, text, transformers, unorderedContainers, vector -, vectorBinaryInstances, zlib +, vectorBinaryInstances, x11, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.14"; - sha256 = "1nygyzrgzrv7qfr153xvkh50p0sjrbv3jbif7qmpam5jjlw26ahs"; + version = "0.4.99.0"; + sha256 = "1mcz44akf706a0q1xr4h7hlf1gj60570bi8im6jpg73k728314cp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,16 +22,12 @@ cabal.mkDerivation (self: { hsini keys miniutter mtl prettyShow random stm text transformers unorderedContainers vector vectorBinaryInstances zlib ]; - doCheck = false; - patchPhase = '' - sed -i -e 's|gtk >=.*|gtk|' LambdaHack.cabal - ''; + pkgconfigDepends = [ gtk x11 ]; meta = { homepage = "http://github.com/LambdaHack/LambdaHack"; - description = "A roguelike game engine in early development"; + description = "A game engine library for roguelike dungeon crawlers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) |