Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

julius: darwin build, add maintainer #318047

Merged
merged 1 commit into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions pkgs/games/julius/darwin-fixes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 038a34ba..d46b9258 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,16 +669,14 @@ endif()
if(APPLE)
# generating a macOS icns file (see https://stackoverflow.com/a/20703594)
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/res/julius.icns
- COMMAND mkdir -p julius.iconset
- COMMAND sips -z 16 16 julius_256.png --out julius.iconset/icon_16x16.png
- COMMAND sips -z 32 32 julius_256.png --out julius.iconset/icon_16x16@2x.png
- COMMAND sips -z 32 32 julius_256.png --out julius.iconset/icon_32x32.png
- COMMAND sips -z 64 64 julius_256.png --out julius.iconset/icon_32x32@2x.png
- COMMAND sips -z 128 128 julius_256.png --out julius.iconset/icon_128x128.png
- COMMAND sips -z 256 256 julius_256.png --out julius.iconset/icon_128x128@2x.png
- COMMAND sips -z 256 256 julius_256.png --out julius.iconset/icon_256x256.png
- COMMAND sips -z 512 512 julius_512.png --out julius.iconset/icon_256x256@2x.png
- COMMAND iconutil -c icns julius.iconset
+ COMMAND mkdir julius.iconset
+ COMMAND convert julius_256.png -resize 16x16 julius.iconset/icon_16.png
+ COMMAND convert julius_256.png -resize 32x32 julius.iconset/icon_32.png
+ COMMAND convert julius_256.png -resize 64x64 julius.iconset/icon_64.png
+ COMMAND convert julius_256.png -resize 128x128 julius.iconset/icon_128.png
+ COMMAND cp julius_256.png julius.iconset/icon_256.png
+ COMMAND cp julius_512.png julius.iconset/icon_512.png
+ COMMAND png2icns julius.icns julius.iconset/icon_{16,32,64,128,256,512}.png
COMMAND rm -R julius.iconset
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/res)
set_source_files_properties(${PROJECT_SOURCE_DIR}/res/julius.icns PROPERTIES
@@ -687,7 +685,6 @@ if(APPLE)
# setting variables that will populate Info.plist
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.github.bvschaik.julius")
set(MACOSX_BUNDLE_BUNDLE_NAME ${USER_FRIENDLY_NAME})
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version" FORCE)
set(MACOSX_BUNDLE_ICON_FILE "julius.icns")
set(MACOSX_BUNDLE_BUNDLE_VERSION
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${VERSION_REVISION}")
diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake
index 29cc683c..1fa28a1f 100644
--- a/cmake/FindSDL2_mixer.cmake
+++ b/cmake/FindSDL2_mixer.cmake
@@ -93,7 +93,6 @@ ELSE()
PATH_SUFFIXES include include/SDL2
PATHS ${SDL2_SEARCH_PATHS}
)
- set(SDL2_MIXER_INCLUDE_DIR "${SDL2_MIXER_INCLUDE_DIR}/Headers")
endif()

if(NOT APPLE OR NOT EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")
37 changes: 32 additions & 5 deletions pkgs/games/julius/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
, SDL2_mixer
, cmake
, libpng
, darwin
, libicns
, imagemagick
}:

stdenv.mkDerivation rec {
pname = "julius";
version = "1.7.0";
Expand All @@ -18,16 +20,41 @@ stdenv.mkDerivation rec {
hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A=";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 SDL2_mixer libpng ];
patches = [
# This fixes the darwin bundle generation, sets min. deployment version
# and patches SDL2_mixer include
./darwin-fixes.patch
];

nativeBuildInputs = [
cmake
] ++ lib.optionals stdenv.isDarwin [
darwin.sigtool
libicns
imagemagick
];

buildInputs = [
SDL2
SDL2_mixer
libpng
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
];

installPhase = lib.optionalString stdenv.isDarwin ''
runHook preInstall
mkdir -p $out/Applications
cp -r julius.app $out/Applications/
matteo-pacini marked this conversation as resolved.
Show resolved Hide resolved
runHook postInstall
'';

meta = with lib; {
homepage = "https://github.com/bvschaik/julius";
description = "An open source re-implementation of Caesar III";
mainProgram = "julius";
license = licenses.agpl3Only;
maintainers = with maintainers; [ Thra11 ];
maintainers = with maintainers; [ Thra11 matteopacini ];
platforms = platforms.all;
broken = stdenv.isDarwin;
};
}