diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix index 5c6e1c747e32..d9be4633e5cb 100644 --- a/pkgs/by-name/ma/mathematica/generic.nix +++ b/pkgs/by-name/ma/mathematica/generic.nix @@ -10,7 +10,7 @@ # arguments from default.nix lang, meta, - name, + pname, src, version, # dependencies @@ -89,7 +89,7 @@ in stdenv.mkDerivation { inherit meta - name + pname src version ; diff --git a/pkgs/by-name/ma/mathematica/package.nix b/pkgs/by-name/ma/mathematica/package.nix index e0bdd7b0f1ce..62ce806a98b0 100644 --- a/pkgs/by-name/ma/mathematica/package.nix +++ b/pkgs/by-name/ma/mathematica/package.nix @@ -62,14 +62,13 @@ in callPackage ./generic.nix { inherit cudaSupport cudaPackages; - inherit (found-version) version lang; + inherit (found-version) lang; src = if source == null then found-version.src else source; - name = ( - "mathematica" + pname = "mathematica"; + version = + found-version.version + lib.optionalString cudaSupport "-cuda" - + "-${found-version.version}" - + lib.optionalString (lang != "en") "-${lang}" - ); + + lib.optionalString (lang != "en") "-${lang}"; meta = { description = "Wolfram Mathematica computational software system"; homepage = "https://www.wolfram.com/mathematica/";