diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/games/zandronum | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/games/zandronum')
| -rw-r--r-- | pkgs/games/zandronum/bin.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/zandronum/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 6ac61571d4cbf..0d6c21bfa8230 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zandronum.com/; - description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; + description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; maintainers = [ stdenv.lib.maintainers.lassulus ]; # Binary version has different version string than source code version. license = stdenv.lib.licenses.unfreeRedistributable; diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 18abf280a81e8..39c1ea6b74692 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { preConfigure = '' ln -s ${sqlite-amalgamation}/* sqlite/ + sed -ie 's| restrict| _restrict|g' dumb/include/dumb.h \ + dumb/src/it/*.c ''; cmakeFlags = @@ -57,7 +59,7 @@ in stdenv.mkDerivation { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; maintainers = with maintainers; [ lassulus ]; + license = stdenv.lib.licenses.unfree; platforms = platforms.linux; - license = licenses.bsdOriginal; }; } |