From 65bafefd5c14ba2206cf0fcf154e248fa2b576fe Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 20 Oct 2025 15:41:25 +0200 Subject: [PATCH] aegisub: remove overrides from all-package.nix The config option was introduced in 9361acfff13586840a41e16496c28dc27848671d, this should just be done via overlays today. --- pkgs/by-name/ae/aegisub/package.nix | 6 +++++- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 5571e8051691..2f6110a33b19 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -39,6 +39,10 @@ useBundledLuaJIT ? false, }: +let + luajit' = luajit.override { enable52Compat = true; }; +in + stdenv.mkDerivation (finalAttrs: { pname = "aegisub"; version = "3.4.2"; @@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals portaudioSupport [ portaudio ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals spellcheckSupport [ hunspell ] - ++ lib.optionals (!useBundledLuaJIT) [ luajit ]; + ++ lib.optionals (!useBundledLuaJIT) [ luajit' ]; mesonFlags = [ (lib.mesonEnable "alsa" alsaSupport) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1630324bfd23..39c828445c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -956,13 +956,6 @@ with pkgs; opnplug = adlplug.override { type = "OPN"; }; - aegisub = callPackage ../by-name/ae/aegisub/package.nix ( - { - luajit = luajit.override { enable52Compat = true; }; - } - // (config.aegisub or { }) - ); - acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; };