diff --git a/flake.lock b/flake.lock index 4734661..b7c4492 100644 --- a/flake.lock +++ b/flake.lock @@ -623,11 +623,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1717245190, - "narHash": "sha256-UFuJkXgNQ2JbD6P9EJCzelUQ73wzxzGrybfkO3o/LGU=", + "lastModified": 1717628902, + "narHash": "sha256-qMAW+oKis3F8jXTjX9Ng02/LzZd+7YOK05Qa33h9yqY=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "9b78c3a4c5800e1998d330d06d662598b21ac0d1", + "rev": "3e0ee08114e1563b1a0fd6a907563b5e86258fb4", "type": "github" }, "original": { diff --git a/pkgs/chocolate-doom2xx.nix b/pkgs/chocolate-doom2xx.nix new file mode 100644 index 0000000..1d13224 --- /dev/null +++ b/pkgs/chocolate-doom2xx.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, autoreconfHook, pkg-config, SDL, SDL_mixer, SDL_net +, fetchFromGitHub, fetchpatch, python3 }: + +stdenv.mkDerivation rec { + pname = "chocolate-doom"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "chocolate-doom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-1uw/1CYKBvDNgT5XxRBY24Evt3f4Y6YQ6bScU+KNHgM="; + }; + + patches = [ + # Pull upstream patch to fix build against gcc-10: + # https://github.com/chocolate-doom/chocolate-doom/pull/1257 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch"; + sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj"; + }) + ]; + + outputs = [ "out" "man" ]; + + postPatch = '' + patchShebangs --build man/{simplecpp,docgen} + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + # for documentation + python3 + ]; + buildInputs = [ SDL SDL_mixer SDL_net ]; + enableParallelBuilding = true; + + meta = { + homepage = "http://chocolate-doom.org/"; + description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + hydraPlatforms = lib.platforms.linux; # darwin times out + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index b75672a..73e310c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,4 +9,5 @@ in librespeed-go = callPackage ./librespeed-go.nix { }; modrinth-app = callPackage ./modrinth-app { }; glfw-minecraft = callPackage ./glfw-minecraft { }; + chocolate-doom2xx = callPackage ./chocolate-doom2xx.nix { }; }