diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-04 16:56:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 16:56:26 +0100 |
| commit | 217285c79e549a0596b65627a52f247a0ffe4f3b (patch) | |
| tree | 4c98b4c0ea2bf9608abb735dc560e8df786c7dca /pkgs/games | |
| parent | 06c9dbcece50727ef83dc8096b781d5749759d8a (diff) | |
| parent | 58d6dc335959c035113314efec6ba9699729c207 (diff) | |
Merge pull request #108299 from siraben/zdbsp-platform
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/zdoom/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/zdoom/zdbsp.nix | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 646021eb2fcc..37a8fd0fda8d 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { sourceRoot = "."; - enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; preConfigure = '' diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index e86ebd6dbc22..3dc523b49855 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, cmake, unzip, zlib }: +{ stdenv, fetchzip, cmake, zlib }: stdenv.mkDerivation rec { pname = "zdbsp"; version = "1.19"; - src = fetchurl { + src = fetchzip { url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; - sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr"; + sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d"; + stripRoot = false; }; - nativeBuildInputs = [cmake unzip]; - buildInputs = [zlib]; - sourceRoot = "."; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + installPhase = '' install -Dm755 zdbsp $out/bin/zdbsp ''; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "ZDoom's internal node builder for DOOM maps"; homepage = "https://zdoom.org/wiki/ZDBSP"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ertes]; - platforms = platforms.linux; + maintainers = with maintainers; [ lassulus siraben ]; + platforms = platforms.unix; }; } |