Merge branch 'nixpkgs-update' into master

1 files changed, 4 insertions, 6 deletions

diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index e7200ff22e9..58aa6daeece 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/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
 }:
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   version = "3.0.1";
 
   src = fetchhg {
-    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
+    url = "https://hg.osdn.net/view/zandronum/zandronum-stable";
     rev = "ZA_${version}";
     sha256 = "16v5b6wfrmabs3ky6isbfhlrqdjrr1pvfxlxwk0im02kcpxxw9qw";
   };
@@ -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 ];