Merge pull request #331636 from emilazy/push-lowxmspxtzxz

attract-mode: 2.6.2 -> 2.7.0-unstable-2024-08-02

pkgs/applications/emulators/attract-mode/default.nix

@@ -1,34 +0,0 @@
-{ expat, fetchFromGitHub, ffmpeg_4, fontconfig, freetype, libarchive, libjpeg
-, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib
-}:
-
-stdenv.mkDerivation rec {
-  pname = "attract-mode";
-  version = "2.6.2";
-
-  src = fetchFromGitHub {
-    owner = "mickelson";
-    repo = "attract";
-    rev = "v${version}";
-    sha256 = "sha256-gKxUU2y6Gtm5a/tXYw/fsaTBrriNh5vouPGICs3Ph3c=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  patchPhase = ''
-    sed -i "s|prefix=/usr/local|prefix=$out|" Makefile
-  '';
-
-  buildInputs = [
-    expat ffmpeg_4 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
-  ];
-
-  meta = with lib; {
-    description = "Frontend for arcade cabinets and media PCs";
-    homepage = "http://attractmode.org";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ hrdinka ];
-    platforms = with platforms; linux;
-    mainProgram = "attract";
-  };
-}

pkgs/by-name/at/attract-mode/package.nix

@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  expat,
+  ffmpeg_7,
+  freetype,
+  libarchive,
+  libjpeg,
+  libGLU,
+  sfml,
+  zlib,
+  openal,
+  fontconfig,
+  darwin,
+}:
+
+stdenv.mkDerivation {
+  pname = "attract-mode";
+  version = "2.7.0-unstable-2024-08-02";
+
+  src = fetchFromGitHub {
+    owner = "mickelson";
+    repo = "attract";
+    rev = "6ed3a1e32a519608c0b495295cc4c18ceea6b461";
+    hash = "sha256-uhbu/DaQSE9Dissv7XLFMVYitPn8ZEewq90poCtEfYY=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    [
+      expat
+      ffmpeg_7
+      freetype
+      libarchive
+      libjpeg
+      libGLU
+      sfml
+      zlib
+    ]
+    ++ lib.optionals (!stdenv.isDarwin) [
+      openal
+      fontconfig
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Cocoa
+      darwin.apple_sdk.frameworks.Carbon
+      darwin.apple_sdk.frameworks.IOKit
+      darwin.apple_sdk.frameworks.CoreVideo
+      darwin.apple_sdk.frameworks.OpenAL
+    ];
+
+  makeFlags = [
+    "prefix=$(out)"
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+    "STRIP=${stdenv.cc.targetPrefix}strip"
+    "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+    "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "BUILD_EXPAT=0"
+  ] ++ lib.optionals stdenv.isDarwin [ "USE_FONTCONFIG=0" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Frontend for arcade cabinets and media PCs";
+    homepage = "http://attractmode.org";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.hrdinka ];
+    platforms = lib.platforms.unix;
+    mainProgram = "attract";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2542,8 +2542,6 @@ with pkgs;
     unfreeEnableDiscord = true;
   };
 
-  attract-mode = callPackage ../applications/emulators/attract-mode { };
-
   basiliskii = callPackage ../applications/emulators/basiliskii { };
 
   box64 = callPackage ../applications/emulators/box64 {