Unverified Commit 65bafefd authored by Wolfgang Walther's avatar Wolfgang Walther Committed by Michael Daniels
Browse files

aegisub: remove overrides from all-package.nix

The config option was introduced in
9361acff, this should just be done via
overlays today.
parent 0849763b
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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)
+0 −7
Original line number Diff line number Diff line
@@ -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;
  };