public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108299 from siraben/zdbsp-platform

Browse Source
This commit is contained in:
Sandro 2021-01-04 16:56:26 +01:00 committed by GitHub
commit 217285c79e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/zdoom/default.nix
View File

@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
sourceRoot = "."; sourceRoot = ".";
enableParallelBuilding = true;
NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ];
preConfigure = '' preConfigure = ''

18
pkgs/games/zdoom/zdbsp.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, cmake, unzip, zlib }: { stdenv, fetchzip, cmake, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zdbsp"; pname = "zdbsp";
version = "1.19"; version = "1.19";
src = fetchurl { src = fetchzip {
url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip";
sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr"; sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d";
stripRoot = false;
}; };
nativeBuildInputs = [cmake unzip]; nativeBuildInputs = [ cmake ];
buildInputs = [zlib]; buildInputs = [ zlib ];
sourceRoot = ".";
enableParallelBuilding = true;
installPhase = '' installPhase = ''
install -Dm755 zdbsp $out/bin/zdbsp install -Dm755 zdbsp $out/bin/zdbsp
''; '';
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "ZDoom's internal node builder for DOOM maps"; description = "ZDoom's internal node builder for DOOM maps";
homepage = "https://zdoom.org/wiki/ZDBSP"; homepage = "https://zdoom.org/wiki/ZDBSP";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ertes]; maintainers = with maintainers; [ lassulus siraben ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }