Merge pull request #34572 from esoeylemez/ertes-bcc
doom-bcc-git: init at 2018.01.04
This commit is contained in:
commit
6e782a0ef6
31
pkgs/games/zdoom/bcc-git.nix
Normal file
31
pkgs/games/zdoom/bcc-git.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "doom-bcc-git-0.8.0.2018.01.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wormt";
|
||||
repo = "bcc";
|
||||
rev = "d58b44d9f18b28fd732c27113e5607a454506d19";
|
||||
sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = ["CC=cc"];
|
||||
|
||||
patches = [ ./bcc-warning-fix.patch ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib,share/doc}
|
||||
install -m755 bcc $out/bin/bcc
|
||||
cp -av doc $out/share/doc/bcc
|
||||
cp -av lib $out/lib/bcc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Compiler for Doom/Hexen scripts (ACS, BCS)";
|
||||
homepage = https://github.com/wormt/bcc;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ertes];
|
||||
};
|
||||
}
|
25
pkgs/games/zdoom/bcc-warning-fix.patch
Normal file
25
pkgs/games/zdoom/bcc-warning-fix.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
From c6ac05c96b7908ccd35f3908fc0f13650b0583c0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <esz@posteo.de>
|
||||
Date: Sat, 3 Feb 2018 17:08:54 +0100
|
||||
Subject: [PATCH] Remove -Werror
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index bbe2c75..3357d2d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,7 +4,7 @@ EXE=bcc
|
||||
BUILD_DIR=build
|
||||
CC=gcc
|
||||
INCLUDE=-Isrc -I src/parse
|
||||
-OPTIONS=-Wall -Werror -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \
|
||||
+OPTIONS=-Wall -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \
|
||||
-Wstrict-aliasing=2 -Wmissing-field-initializers -D_BSD_SOURCE \
|
||||
-D_DEFAULT_SOURCE $(INCLUDE)
|
||||
VERSION_FILE=$(BUILD_DIR)/version.c
|
||||
--
|
||||
2.15.1
|
||||
|
|
@ -1897,6 +1897,8 @@ with pkgs;
|
|||
};
|
||||
doomseeker = callPackage ../applications/misc/doomseeker { };
|
||||
|
||||
doom-bcc = callPackage ../games/zdoom/bcc-git.nix { };
|
||||
|
||||
slade = callPackage ../applications/misc/slade {
|
||||
wxGTK = wxGTK30;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue