dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

octave.buildEnv: fix the eval

Browse Source 
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
This commit is contained in:
Sergei Trofimovich 2024-08-06 21:39:08 +01:00
parent 23e8654f46
commit 5ee19b6f17
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/octave/default.nix
View File

@ -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; };