Merge pull request #173056 from dwarfmaster/arcan.arcan

arcan.arcan: 0.6.1 -> 0.6.1.1

pkgs/desktops/arcan/arcan/003-freetype.patch

@@ -1,14 +0,0 @@
-diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
---- source-old/src/CMakeLists.txt	1969-12-31 21:00:01.000000000 -0300
-+++ source-new/src/CMakeLists.txt	2021-10-29 12:03:06.461399341 -0300
-@@ -317,9 +317,7 @@
- 		find_package(BZip2 REQUIRED QUIET)
- 		pkg_check_modules(HARFBUZZ REQUIRED QUIET harfbuzz)
- 		ExternalProject_Add(Freetype
--			SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/freetype"
--			UPDATE_COMMAND ""
--			GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/freetype"
-+			SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/freetype"
- 			${EXTERNAL_DEFS}
- 			${CMAKE_EXTERNAL_DEFS}
- 			-DWITH_ZLIB=OFF

pkgs/desktops/arcan/arcan/default.nix

@@ -48,13 +48,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
-  version = "0.6.1";
+  version = "0.6.1.1";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = "arcan";
     rev = version;
-    hash = "sha256-2do4+6KB0AAcJk22mN0IA/e/bPaeGipLjI4RSTPqLBg=";
+    hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc=";
   };
 
   nativeBuildInputs = [
@@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
     ./000-openal.patch
     ./001-luajit.patch
     ./002-libuvc.patch
-    ./003-freetype.patch
   ];
 
   # Emulate external/git/clone.sh