aegisub: remove overrides from all-package.nix
The config option was introduced in
9361acfff1, this should just be done via
overlays today.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user