diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index b8645053b6e9..1ae5ed706d48 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -45,7 +45,7 @@ let
     }:
     let
       libraryFile = mkLibraryFile pkgs;
-      pname = "agdaWithPackages";
+      pname = "${Agda.meta.mainProgram}" + "WithPackages";
       version = Agda.version;
     in
     runCommand "${pname}-${version}"
@@ -68,7 +68,7 @@ let
       }
       ''
         mkdir -p $out/bin
-        makeWrapper ${lib.getExe Agda} $out/bin/agda \
+        makeWrapper ${lib.getExe Agda} $out/bin/${Agda.meta.mainProgram} \
           ${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \
           --add-flags "--library-file=${libraryFile}"
         ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
@@ -116,7 +116,7 @@ let
         else
           ''
             runHook preBuild
-            agda --build-library
+            ${lib.getExe agdaWithPkgs} --build-library
             runHook postBuild
           '';
 
diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix
index b9fab48170a6..4a000b4866d6 100644
--- a/pkgs/top-level/agda-packages.nix
+++ b/pkgs/top-level/agda-packages.nix
@@ -27,7 +27,7 @@ let
 
       lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; });
 
-      agda = withPackages [ ];
+      "${Agda.meta.mainProgram}" = withPackages [ ];
 
       standard-library = callPackage ../development/libraries/agda/standard-library { };