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

Merge pull request #38950 from tadfisher/quakespasm-userdirs

Browse Source 
quakespasm, vkquake: enable userdirs support
This commit is contained in:
Matthew Justin Bauer 2018-04-20 18:07:05 -05:00 committed by GitHub
commit 0fe77f449a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/games/quakespasm/default.nix
View File

@ -10,30 +10,32 @@ stdenv.mkDerivation rec {
}; };
sourceRoot = "${name}/Quake"; sourceRoot = "${name}/Quake";
buildInputs = [ buildInputs = [
gzip SDL libvorbis libmad gzip SDL libvorbis libmad
]; ];
buildFlags = [ "DO_USERDIRS=1" ];
preInstall = '' preInstall = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
substituteInPlace Makefile --replace "/usr/local/games" "$out/bin" substituteInPlace Makefile --replace "/usr/local/games" "$out/bin"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
description = "An engine for iD software's Quake"; description = "An engine for iD software's Quake";
homepage = http://quakespasm.sourceforge.net/; homepage = http://quakespasm.sourceforge.net/;
longDescription = '' longDescription = ''
QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake.
It includes support for 64 bit CPUs and custom music playback, a new sound driver, It includes support for 64 bit CPUs and custom music playback, a new sound driver,
some graphical niceities, and numerous bug-fixes and other improvements. some graphical niceities, and numerous bug-fixes and other improvements.
Quakespasm utilizes either the SDL or SDL2 frameworks, so choose which one Quakespasm utilizes either the SDL or SDL2 frameworks, so choose which one
works best for you. SDL is probably less buggy, but SDL2 has nicer features works best for you. SDL is probably less buggy, but SDL2 has nicer features
and smoother mouse input - though no CD support. and smoother mouse input - though no CD support.
''; '';
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.m3tti ]; maintainers = [ stdenv.lib.maintainers.m3tti ];
}; };

8
pkgs/games/quakespasm/vulkan.nix
View File

@ -12,11 +12,13 @@ stdenv.mkDerivation rec {
}; };
sourceRoot = "source/Quake"; sourceRoot = "source/Quake";
buildInputs = [ buildInputs = [
makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev
]; ];
buildFlags = [ "DO_USERDIRS=1" ];
preInstall = '' preInstall = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
''; '';
@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
description = "Vulkan Quake port based on QuakeSpasm"; description = "Vulkan Quake port based on QuakeSpasm";
homepage = src.meta.homepage; homepage = src.meta.homepage;
@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
passes & sub passes, pipeline barriers & synchronization, compute shaders, push & passes & sub passes, pipeline barriers & synchronization, compute shaders, push &
specialization constants, CPU/GPU parallelism and memory pooling. specialization constants, CPU/GPU parallelism and memory pooling.
''; '';
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.gnidorah ]; maintainers = [ stdenv.lib.maintainers.gnidorah ];
}; };