vkquake: fix build with glslang 16, move to by-name (#455269) (341fca6a) · Commits · nix / nixpkgs

pkgs/by-name/qu/quakespasm/vulkan.nix→pkgs/by-name/vk/vkquake/package.nix

+11 −0

Original line number	Diff line number	Diff line
		{
		SDL2,
		fetchFromGitHub,
		fetchpatch2,
		flac,
		glslang,
		gzip,
		@@ -20,6 +21,7 @@
		vulkan-loader,
		copyDesktopItems,
		makeDesktopItem,
		spirv-tools,
		}:
		stdenv.mkDerivation (finalAttrs: {
		pname = "vkquake";
		@@ -35,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
		nativeBuildInputs = [
		makeWrapper
		glslang
		spirv-tools
		meson
		ninja
		pkg-config
		@@ -57,6 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
		vulkan-headers
		];

		patches = [
		(fetchpatch2 {
		# https://github.com/Novum/vkQuake/pull/809
		url = "https://github.com/Novum/vkQuake/commit/85ddf2386f15944c26317a763d4044077fc8731f.patch?full_index=1";
		hash = "sha256-t+atA+ilCwGwLpql5BZO2OF4Xh1KdzRFjOpglTIA/KY=";
		})
		];

		mesonFlags = [ "-Ddo_userdirs=enabled" ];

		env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

+0 −2

Original line number	Diff line number	Diff line
		@@ -13259,8 +13259,6 @@ with pkgs;
		quake3hires
		;

		vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };

		rott-shareware = callPackage ../by-name/ro/rott/package.nix {
		buildShareware = true;
		};