From c49d51b8232e9b0c1384ad3a6c2c636a06bf643b Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 13 Oct 2025 09:34:17 +0900 Subject: [PATCH 1/3] onscripter: init at 20230825 --- .../on/onscripter/add-make-install.patch | 12 +++ .../on/onscripter/fix-darwin-build.patch | 23 +++++ .../on/onscripter/fix-linux-build.patch | 23 +++++ pkgs/by-name/on/onscripter/package.nix | 97 +++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 pkgs/by-name/on/onscripter/add-make-install.patch create mode 100644 pkgs/by-name/on/onscripter/fix-darwin-build.patch create mode 100644 pkgs/by-name/on/onscripter/fix-linux-build.patch create mode 100644 pkgs/by-name/on/onscripter/package.nix diff --git a/pkgs/by-name/on/onscripter/add-make-install.patch b/pkgs/by-name/on/onscripter/add-make-install.patch new file mode 100644 index 000000000000..f383c924059e --- /dev/null +++ b/pkgs/by-name/on/onscripter/add-make-install.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.onscripter b/Makefile.onscripter +index 0522dd0..6eede0d 100644 +--- a/Makefile.onscripter ++++ b/Makefile.onscripter +@@ -130,3 +130,7 @@ FontInfo$(OBJSUFFIX): FontInfo.h Encoding.h + DirtyRect$(OBJSUFFIX) : DirtyRect.h + AVIWrapper$(OBJSUFFIX): AVIWrapper.h + LUAHandler$(OBJSUFFIX): $(ONSCRIPTER_HEADER) LUAHandler.h ++ ++.PHONY: install ++install: ++ install -Dm755 -t $(out)/bin $(TARGET) diff --git a/pkgs/by-name/on/onscripter/fix-darwin-build.patch b/pkgs/by-name/on/onscripter/fix-darwin-build.patch new file mode 100644 index 000000000000..56f4530463e1 --- /dev/null +++ b/pkgs/by-name/on/onscripter/fix-darwin-build.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.MacOSX b/Makefile.MacOSX +index 878ebf9..03f83c3 100644 +--- a/Makefile.MacOSX ++++ b/Makefile.MacOSX +@@ -6,12 +6,17 @@ + + INCS = `sdl-config --cflags` `smpeg-config --cflags` + +-LIBS = `sdl-config --libs` `smpeg-config --libs` `freetype-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -lm -ljpeg -framework QuickTime -framework CoreFoundation ++LIBS = `sdl-config --libs` `smpeg-config --libs` `freetype-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -lm -ljpeg + DEFS = -DMACOSX -DUSE_CDROM -DUTF8_CAPTION -DUTF8_FILESYSTEM + + EXESUFFIX = + OBJSUFFIX = .o + ++# optional: lua ++DEFS += -DUSE_LUA ++LIBS += -llua ++EXT_OBJS += LUAHandler$(OBJSUFFIX) ++ + .SUFFIXES: + .SUFFIXES: $(OBJSUFFIX) .cpp .h + diff --git a/pkgs/by-name/on/onscripter/fix-linux-build.patch b/pkgs/by-name/on/onscripter/fix-linux-build.patch new file mode 100644 index 000000000000..5348881c57f7 --- /dev/null +++ b/pkgs/by-name/on/onscripter/fix-linux-build.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.Linux b/Makefile.Linux +index 2b551bd..efb1f68 100644 +--- a/Makefile.Linux ++++ b/Makefile.Linux +@@ -41,17 +41,9 @@ LIBS += -logg -lvorbis -lvorbisfile + # optional: support CD audio + DEFS += -DUSE_CDROM + +-# optional: avifile +-DEFS += -DUSE_AVIFILE +-INCS += `avifile-config --cflags` +-LIBS += `avifile-config --libs` +-TARGET += simple_aviplay$(EXESUFFIX) +-EXT_OBJS += AVIWrapper$(OBJSUFFIX) +- + # optional: lua + DEFS += -DUSE_LUA +-INCS += -I/usr/include/lua5.1 +-LIBS += -llua5.1 ++LIBS += -llua + EXT_OBJS += LUAHandler$(OBJSUFFIX) + + # optional: force screen width for PDA diff --git a/pkgs/by-name/on/onscripter/package.nix b/pkgs/by-name/on/onscripter/package.nix new file mode 100644 index 000000000000..fdf5f537ed31 --- /dev/null +++ b/pkgs/by-name/on/onscripter/package.nix @@ -0,0 +1,97 @@ +{ + lib, + SDL, + SDL_image, + SDL_mixer, + SDL_ttf, + bzip2, + fetchFromGitHub, + fontconfig, + freetype, + libjpeg, + libogg, + libpng, + libvorbis, + lua5_1, + runCommand, + smpeg, + stdenv, +}: + +let + inherit (stdenv.hostPlatform) isDarwin; +in +stdenv.mkDerivation (finalAttrs: { + pname = "onscripter"; + version = "20230825"; + + src = fetchFromGitHub { + owner = "ogapee"; + repo = "onscripter"; + rev = finalAttrs.version; + hash = "sha256-XaZTtOkV+2dHmcgZ4GbyiMxRBYdwT5eHxx+r05eAmBw="; + }; + + patches = [ + # Add "install" target to Makefile + ./add-make-install.patch + # 1. Remove libavifile dependency, which is old and unmaintained + # 2. Replace -llua5.1 with -llua because the former didn't work even with Lua 5.1 + ./fix-linux-build.patch + # 1. Remove direct linker flags for macOS SDKs. + # 2. Build with Lua + # + # ONScripter appears to depend on macOS SDKs only indirectly through SDL, so flags provided by + # the sdl-config command should suffice. The existing flags also referenced the deprecated + # QuickTime framework, resulting in a build failure. + ./fix-darwin-build.patch + ]; + + nativeBuildInputs = [ + # Take cross compilation into account + ( + let + commands = [ + "${lib.getDev SDL}/bin/sdl-config" + "${lib.getDev smpeg}/bin/smpeg-config" + ] + ++ lib.optionals isDarwin [ + "${lib.getDev freetype}/bin/freetype-config" + ]; + in + runCommand "onscripter-host-deps" { } '' + mkdir -p $out/bin + ln -s ${lib.escapeShellArgs commands} $out/bin + '' + ) + ]; + + buildInputs = [ + SDL + SDL_image + SDL_mixer + SDL_ttf + bzip2 + libjpeg + libogg + libpng + libvorbis + lua5_1 + smpeg + ] + ++ (if isDarwin then [ freetype ] else [ fontconfig ]); + + # The build script for BSDs also fall under Makefile.Linux + makefile = if isDarwin then "Makefile.MacOSX" else "Makefile.Linux"; + + strictDeps = true; + + meta = { + homepage = "https://ogapee.github.io/www/onscripter_en.html"; + description = "Japanese visual novel scripting engine"; + license = lib.licenses.gpl2Plus; + mainProgram = "onscripter"; + maintainers = with lib.maintainers; [ midchildan ]; + platforms = lib.platforms.unix; + }; +}) From a9b7e173599920f737aa36cde62ef504deb09f64 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 13 Oct 2025 09:35:28 +0900 Subject: [PATCH 2/3] onscripter-en: base package on onscripter Also fix Darwin build. --- .../on/onscripter-en/fix-darwin-build.patch | 87 ++++++++++++ pkgs/by-name/on/onscripter-en/package.nix | 128 ++++++++++-------- 2 files changed, 162 insertions(+), 53 deletions(-) create mode 100644 pkgs/by-name/on/onscripter-en/fix-darwin-build.patch diff --git a/pkgs/by-name/on/onscripter-en/fix-darwin-build.patch b/pkgs/by-name/on/onscripter-en/fix-darwin-build.patch new file mode 100644 index 000000000000..5c65ba33648a --- /dev/null +++ b/pkgs/by-name/on/onscripter-en/fix-darwin-build.patch @@ -0,0 +1,87 @@ +diff --git a/Info.plist b/Info.plist +index 977496b..615957f 100644 +--- a/Info.plist ++++ b/Info.plist +@@ -1,4 +1,3 @@ +-#include "../version.h" + + + +diff --git a/ONScripter.xcodeproj/project.pbxproj b/ONScripter.xcodeproj/project.pbxproj +index db98945..49a7254 100644 +--- a/ONScripter.xcodeproj/project.pbxproj ++++ b/ONScripter.xcodeproj/project.pbxproj +@@ -61,7 +61,6 @@ + 365D36490BE42E3F00D1832A /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A98430BE05D5E00786213 /* AudioUnit.framework */; }; + 365D36590BE42E3F00D1832A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A985B0BE05D8300786213 /* AudioToolbox.framework */; }; + 365D37360BE42E4100D1832A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A993F0BE05DBB00786213 /* IOKit.framework */; }; +- 365D37D40BE42E4200D1832A /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A99E00BE05DCC00786213 /* QuickTime.framework */; }; + 365D37F60BE42E4200D1832A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A9A050BE05E0800786213 /* Carbon.framework */; }; + 365D388C0BE42E4400D1832A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A98290BE05D3600786213 /* OpenGL.framework */; }; + 36D4F7A60D5D0C6D00B0FA18 /* DirPaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36D4F7A40D5D0C6D00B0FA18 /* DirPaths.cpp */; }; +@@ -407,7 +406,6 @@ + 365D36490BE42E3F00D1832A /* AudioUnit.framework in Frameworks */, + 365D36590BE42E3F00D1832A /* AudioToolbox.framework in Frameworks */, + 365D37360BE42E4100D1832A /* IOKit.framework in Frameworks */, +- 365D37D40BE42E4200D1832A /* QuickTime.framework in Frameworks */, + 365D37F60BE42E4200D1832A /* Carbon.framework in Frameworks */, + 365D388C0BE42E4400D1832A /* OpenGL.framework in Frameworks */, + E29F3440142C287C00052F81 /* libfreetype.a in Frameworks */, +@@ -988,6 +986,8 @@ + /* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; ++ attributes = { ++ }; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ONScripter" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; +@@ -1401,7 +1401,8 @@ + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; +- GCC_VERSION = com.apple.compilers.llvmgcc42; ++ GCC_VERSION = ""; ++ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( +@@ -1411,6 +1412,7 @@ + "\"$(SRCROOT)/\"", + ); + PREBINDING = NO; ++ SDKROOT = macosx; + }; + name = Debug; + }; +@@ -1418,13 +1420,10 @@ + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; +- ARCHS = ( +- x86_64, +- i386, +- ); ++ ARCHS = "$(ARCHS_STANDARD)"; + GCC_OPTIMIZATION_LEVEL = 2; +- GCC_VERSION = 4.0; +- "GCC_VERSION[sdk=macosx10.6][arch=*]" = com.apple.compilers.llvmgcc42; ++ GCC_VERSION = ""; ++ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( +@@ -1436,10 +1435,11 @@ + OTHER_CPLUSPLUSFLAGS = ( + "-Wl,--gc-sections", + "$(OTHER_CFLAGS)", ++ "-Wno-format-security", ++ "-Wno-narrowing", + ); + PREBINDING = NO; +- SDKROOT = macosx10.4; +- "SDKROOT[arch=x86_64]" = macosx10.6; ++ SDKROOT = macosx; + }; + name = Release; + }; diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix index 57c2703b691e..09dd2a203789 100644 --- a/pkgs/by-name/on/onscripter-en/package.nix +++ b/pkgs/by-name/on/onscripter-en/package.nix @@ -1,66 +1,88 @@ { lib, - SDL, - SDL_image, - SDL_mixer, - SDL_ttf, + buildEnv, fetchFromGitHub, - freetype, - libjpeg, - libogg, - libpng, - libvorbis, + makeBinaryWrapper, + onscripter, pkg-config, - smpeg, - stdenv, + xcbuildHook, }: -stdenv.mkDerivation (finalAttrs: { - pname = "onscripter-en"; - version = "20110930"; +let + inherit (onscripter) stdenv; +in +onscripter.overrideAttrs ( + final: prev: { + pname = "onscripter-en"; + version = "20110930"; - # The website is not available now. Let's use a Museoa backup - src = fetchFromGitHub { - owner = "museoa"; - repo = "onscripter-en"; - rev = finalAttrs.version; - hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg="; - }; + # The website is not available now. Let's use a Museoa backup + src = fetchFromGitHub { + owner = "museoa"; + repo = "onscripter-en"; + rev = final.version; + hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg="; + }; - nativeBuildInputs = [ - SDL - pkg-config - smpeg - ]; + patches = lib.optionals stdenv.isDarwin [ + # Build with newer compilers and SDKs + ./fix-darwin-build.patch + ]; - buildInputs = [ - SDL - SDL_image - SDL_mixer - SDL_ttf - freetype - libjpeg - libogg - libpng - libvorbis - smpeg - ]; + sourceRoot = lib.optionalDrvAttr stdenv.isDarwin "source/macosx"; - configureFlags = [ "--no-werror" ]; + nativeBuildInputs = + prev.nativeBuildInputs + ++ [ pkg-config ] + ++ lib.optionals stdenv.isDarwin [ + makeBinaryWrapper + xcbuildHook + ]; - strictDeps = true; + preUnpack = + let + onscrlib = buildEnv { + name = "onscrlib"; + paths = final.buildInputs; + extraOutputsToInstall = [ "dev" ]; + extraPrefix = "/onscrlib"; + }; + in + lib.optionalString stdenv.isDarwin '' + ln -s ${onscrlib} onscrlib + ''; - preBuild = '' - sed -i 's/.dll//g' Makefile - ''; + configureFlags = [ + "--no-werror" + ] + ++ lib.optionals (!stdenv.cc.isGNU) [ + "--unsupported-compiler" + ]; - meta = { - homepage = "https://github.com/museoa/onscripter-en"; - description = "Japanese visual novel scripting engine"; - license = lib.licenses.gpl2Plus; - mainProgram = "onscripter-en"; - maintainers = [ ]; - platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; - }; -}) + makefile = "Makefile"; + + preBuild = lib.optionalString (!stdenv.isDarwin) '' + sed -i 's/.dll//g' Makefile + ''; + + installPhase = lib.optionalDrvAttr stdenv.isDarwin '' + runHook preInstall + + mkdir -p $out/{bin,Applications} + cp -R Products/Release/ONScripter.app $out/Applications + makeWrapper $out/Applications/ONScripter.app/Contents/MacOS/ONScripter \ + $out/bin/${lib.escapeShellArg final.meta.mainProgram} + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/museoa/onscripter-en"; + description = "English-focused fork of ONScripter"; + license = lib.licenses.gpl2Plus; + mainProgram = "onscripter-en"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; + } +) From b225803c3e59e42b2ffd086e1e4a072b5836f43b Mon Sep 17 00:00:00 2001 From: midchildan Date: Thu, 16 Oct 2025 10:57:30 +0900 Subject: [PATCH 3/3] onscripter-en: remove --- .../on/onscripter-en/fix-darwin-build.patch | 87 ------------------ pkgs/by-name/on/onscripter-en/package.nix | 88 ------------------- pkgs/by-name/sd/SDL_mixer/package.nix | 4 +- pkgs/top-level/aliases.nix | 1 + 4 files changed, 3 insertions(+), 177 deletions(-) delete mode 100644 pkgs/by-name/on/onscripter-en/fix-darwin-build.patch delete mode 100644 pkgs/by-name/on/onscripter-en/package.nix diff --git a/pkgs/by-name/on/onscripter-en/fix-darwin-build.patch b/pkgs/by-name/on/onscripter-en/fix-darwin-build.patch deleted file mode 100644 index 5c65ba33648a..000000000000 --- a/pkgs/by-name/on/onscripter-en/fix-darwin-build.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Info.plist b/Info.plist -index 977496b..615957f 100644 ---- a/Info.plist -+++ b/Info.plist -@@ -1,4 +1,3 @@ --#include "../version.h" - - - -diff --git a/ONScripter.xcodeproj/project.pbxproj b/ONScripter.xcodeproj/project.pbxproj -index db98945..49a7254 100644 ---- a/ONScripter.xcodeproj/project.pbxproj -+++ b/ONScripter.xcodeproj/project.pbxproj -@@ -61,7 +61,6 @@ - 365D36490BE42E3F00D1832A /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A98430BE05D5E00786213 /* AudioUnit.framework */; }; - 365D36590BE42E3F00D1832A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A985B0BE05D8300786213 /* AudioToolbox.framework */; }; - 365D37360BE42E4100D1832A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A993F0BE05DBB00786213 /* IOKit.framework */; }; -- 365D37D40BE42E4200D1832A /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A99E00BE05DCC00786213 /* QuickTime.framework */; }; - 365D37F60BE42E4200D1832A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A9A050BE05E0800786213 /* Carbon.framework */; }; - 365D388C0BE42E4400D1832A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365A98290BE05D3600786213 /* OpenGL.framework */; }; - 36D4F7A60D5D0C6D00B0FA18 /* DirPaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36D4F7A40D5D0C6D00B0FA18 /* DirPaths.cpp */; }; -@@ -407,7 +406,6 @@ - 365D36490BE42E3F00D1832A /* AudioUnit.framework in Frameworks */, - 365D36590BE42E3F00D1832A /* AudioToolbox.framework in Frameworks */, - 365D37360BE42E4100D1832A /* IOKit.framework in Frameworks */, -- 365D37D40BE42E4200D1832A /* QuickTime.framework in Frameworks */, - 365D37F60BE42E4200D1832A /* Carbon.framework in Frameworks */, - 365D388C0BE42E4400D1832A /* OpenGL.framework in Frameworks */, - E29F3440142C287C00052F81 /* libfreetype.a in Frameworks */, -@@ -988,6 +986,8 @@ - /* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; -+ attributes = { -+ }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ONScripter" */; - compatibilityVersion = "Xcode 3.1"; - developmentRegion = English; -@@ -1401,7 +1401,8 @@ - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; -- GCC_VERSION = com.apple.compilers.llvmgcc42; -+ GCC_VERSION = ""; -+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( -@@ -1411,6 +1412,7 @@ - "\"$(SRCROOT)/\"", - ); - PREBINDING = NO; -+ SDKROOT = macosx; - }; - name = Debug; - }; -@@ -1418,13 +1420,10 @@ - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; -- ARCHS = ( -- x86_64, -- i386, -- ); -+ ARCHS = "$(ARCHS_STANDARD)"; - GCC_OPTIMIZATION_LEVEL = 2; -- GCC_VERSION = 4.0; -- "GCC_VERSION[sdk=macosx10.6][arch=*]" = com.apple.compilers.llvmgcc42; -+ GCC_VERSION = ""; -+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( -@@ -1436,10 +1435,11 @@ - OTHER_CPLUSPLUSFLAGS = ( - "-Wl,--gc-sections", - "$(OTHER_CFLAGS)", -+ "-Wno-format-security", -+ "-Wno-narrowing", - ); - PREBINDING = NO; -- SDKROOT = macosx10.4; -- "SDKROOT[arch=x86_64]" = macosx10.6; -+ SDKROOT = macosx; - }; - name = Release; - }; diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix deleted file mode 100644 index 09dd2a203789..000000000000 --- a/pkgs/by-name/on/onscripter-en/package.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - buildEnv, - fetchFromGitHub, - makeBinaryWrapper, - onscripter, - pkg-config, - xcbuildHook, -}: - -let - inherit (onscripter) stdenv; -in -onscripter.overrideAttrs ( - final: prev: { - pname = "onscripter-en"; - version = "20110930"; - - # The website is not available now. Let's use a Museoa backup - src = fetchFromGitHub { - owner = "museoa"; - repo = "onscripter-en"; - rev = final.version; - hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg="; - }; - - patches = lib.optionals stdenv.isDarwin [ - # Build with newer compilers and SDKs - ./fix-darwin-build.patch - ]; - - sourceRoot = lib.optionalDrvAttr stdenv.isDarwin "source/macosx"; - - nativeBuildInputs = - prev.nativeBuildInputs - ++ [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ - makeBinaryWrapper - xcbuildHook - ]; - - preUnpack = - let - onscrlib = buildEnv { - name = "onscrlib"; - paths = final.buildInputs; - extraOutputsToInstall = [ "dev" ]; - extraPrefix = "/onscrlib"; - }; - in - lib.optionalString stdenv.isDarwin '' - ln -s ${onscrlib} onscrlib - ''; - - configureFlags = [ - "--no-werror" - ] - ++ lib.optionals (!stdenv.cc.isGNU) [ - "--unsupported-compiler" - ]; - - makefile = "Makefile"; - - preBuild = lib.optionalString (!stdenv.isDarwin) '' - sed -i 's/.dll//g' Makefile - ''; - - installPhase = lib.optionalDrvAttr stdenv.isDarwin '' - runHook preInstall - - mkdir -p $out/{bin,Applications} - cp -R Products/Release/ONScripter.app $out/Applications - makeWrapper $out/Applications/ONScripter.app/Contents/MacOS/ONScripter \ - $out/bin/${lib.escapeShellArg final.meta.mainProgram} - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/museoa/onscripter-en"; - description = "English-focused fork of ONScripter"; - license = lib.licenses.gpl2Plus; - mainProgram = "onscripter-en"; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; - } -) diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index e0fd4a8db33f..5e7d17b2a31a 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -11,7 +11,7 @@ smpeg, stdenv, # passthru.tests - onscripter-en, + onscripter, # Boolean flags enableNativeMidi ? false, enableSdltest ? (!stdenv.hostPlatform.isDarwin), @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; passthru.tests = { - inherit onscripter-en; + inherit onscripter; }; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bead703c539d..83cc9e7583cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1980,6 +1980,7 @@ mapAliases { offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01 oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 + onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17 onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26 openai-triton-llvm = triton-llvm; # added 2024-07-18 openai-whisper-cpp = whisper-cpp; # Added 2024-12-13