From 30cee69bb9ccfb280a9edafbb39b7eef713de47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= Date: Wed, 16 Jul 2025 18:08:26 +0200 Subject: [PATCH] haskellPackages.Agda: set `mainProgram` --- pkgs/build-support/agda/default.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 1722e3df5f0e..b4609940fedc 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -65,10 +65,10 @@ let } '' mkdir -p $out/bin - makeWrapper ${lib.getBin Agda}/bin/agda $out/bin/agda \ + makeWrapper ${lib.getExe Agda} $out/bin/agda \ ${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \ --add-flags "--library-file=${library-file}" - ln -s ${lib.getBin Agda}/bin/agda-mode $out/bin/agda-mode + ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode ''; withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 795b769677a2..75d88b4cca92 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1362,6 +1362,8 @@ builtins.intersectAttrs super { # very useful. # Flag added in Agda 2.6.4.1, was always enabled before (enableCabalFlag "debug") + # Set the main program + (overrideCabal { mainProgram = "agda"; }) # Split outputs to reduce closure size enableSeparateBinOutput ];