From 5ee19b6f173a1095dcad7d5b2a98c650d39764b5 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 6 Aug 2024 21:39:08 +0100
Subject: [PATCH] octave.buildEnv: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    nix-repl> octave.buildEnv
    error:
       … while evaluating the attribute 'buildEnv'
         at pkgs/development/interpreters/octave/default.nix:205:7:
          204|       inherit enableQt enableReadline enableJava;
          205|       buildEnv = callPackage ./build-env.nix {
             |       ^
          206|         octave = finalAttrs.finalPackage;

       … while calling a functor (an attribute set with a '__functor' attribute)
         at /home/slyfox/dev/git/nixpkgs-master/lib/customisation.nix:264:13:
          263|     in if missingArgs == {}
          264|        then makeOverridable f allArgs
             |             ^
          265|        # This needs to be an abort so it can't be caught with `builtins.tryEval`,

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: function 'anonymous lambda' called with unexpected argument 'octavePackages'
       at pkgs/development/interpreters/octave/build-env.nix:1:1:
            1| { lib, stdenv, octave, buildEnv
             | ^
            2| , makeWrapper, texinfo
---
 pkgs/development/interpreters/octave/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index c0329b45c557..8bf1c43d1239 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -204,7 +204,7 @@ in stdenv.mkDerivation (finalAttrs: {
       inherit enableQt enableReadline enableJava;
       buildEnv = callPackage ./build-env.nix {
         octave = finalAttrs.finalPackage;
-        inherit octavePackages wrapOctave;
+        inherit wrapOctave;
         inherit (octavePackages) computeRequiredOctavePackages;
       };
       withPackages = import ./with-packages.nix { inherit buildEnv octavePackages; };