diff options
Diffstat (limited to 'nixpkgs/pkgs/games/zandronum')
-rw-r--r-- | nixpkgs/pkgs/games/zandronum/default.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/zandronum/fmod.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/zandronum/sqlite.nix | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/games/zandronum/default.nix b/nixpkgs/pkgs/games/zandronum/default.nix index bdafff992434..58aa6daeeceb 100644 --- a/nixpkgs/pkgs/games/zandronum/default.nix +++ b/nixpkgs/pkgs/games/zandronum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage +{ stdenv, lib, fetchhg, cmake, pkg-config, makeWrapper, callPackage , soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme , serverOnly ? false }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ] ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper python3 ]; preConfigure = '' ln -s ${sqlite}/* sqlite/ @@ -51,8 +51,6 @@ in stdenv.mkDerivation rec { then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]); - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; installPhase = '' @@ -74,7 +72,7 @@ in stdenv.mkDerivation rec { inherit fmod sqlite; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; maintainers = with maintainers; [ lassulus MP2E ]; diff --git a/nixpkgs/pkgs/games/zandronum/fmod.nix b/nixpkgs/pkgs/games/zandronum/fmod.nix index 5eebcd4a38e7..4b09cb170c04 100644 --- a/nixpkgs/pkgs/games/zandronum/fmod.nix +++ b/nixpkgs/pkgs/games/zandronum/fmod.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }: let - bits = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; + bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; in @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp -r api/inc $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; homepage = "http://www.fmod.org/"; license = licenses.unfreeRedistributable; diff --git a/nixpkgs/pkgs/games/zandronum/sqlite.nix b/nixpkgs/pkgs/games/zandronum/sqlite.nix index 7f4556c87511..48dd2be9973a 100644 --- a/nixpkgs/pkgs/games/zandronum/sqlite.nix +++ b/nixpkgs/pkgs/games/zandronum/sqlite.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.sqlite.org/"; description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.lassulus ]; }; } |