Refactoring default.nix + remove activate call

Author: thomasjm

templates/common.nix

@@ -1,23 +1,22 @@
-{
-  callPackage,
-  curl,
-  fetchurl,
-  git,
-  cacert,
-  fetchgit,
-  jq,
-  julia,
-  lib,
-  python3,
-  runCommand,
-  stdenv,
-  writeText,
-  makeWrapper,
+{ callPackage
+, curl
+, fetchurl
+, git
+, cacert
+, fetchgit
+, jq
+, julia
+, lib
+, python3
+, runCommand
+, stdenv
+, writeText
+, makeWrapper
 
   # Arguments
-  makeWrapperArgs ? "",
-  precompile ? true,
-  extraBuildInputs ? []
+, precompile ? true
+, extraLibs ? []
+, makeWrapperArgs ? ""
 }:
 
 let
@@ -117,7 +116,7 @@ let
   '';
 
   depot = runCommand "julia-depot" {
-    buildInputs = [git curl julia] ++ extraBuildInputs;
+    buildInputs = [git curl julia] ++ extraLibs;
     inherit registry precompile;
   } ''
     export HOME=$(pwd)
@@ -140,7 +139,6 @@ let
       import Pkg
       Pkg.Registry.add(Pkg.RegistrySpec(path="${registry}"))
 
-      Pkg.activate(".")
       Pkg.instantiate()
 
       if "precompile" in keys(ENV) && ENV["precompile"] != "0"

templates/default.nix

@@ -10,7 +10,17 @@
 # add it here.
 , extraLibs ? []
 
+# Python to put on Julia's PATH and in the PYTHON environment variable.
+# If one is not provided, Julia packages may try to use Conda to obtain their own.
 , python ? pkgs.python3
+
+# Run Pkg.precompile() to precompile all packages?
+, precompile ? true
+
+# Extra arguments to makeWrapper when creating the final Julia wrapper.
+# By default, it will just put the new depot at the end of JULIA_DEPOT_PATH.
+# You can add additional flags here.
+, makeWrapperArgs ? ""
 }:
 
 with pkgs;
@@ -24,24 +34,12 @@ let
     mkdir -p $out/bin
     makeWrapper ${baseJulia}/bin/julia $out/bin/julia \
                 --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLibs}" \
-                --set PYTHON ${python}/bin/python
+                --set PYTHON ${python}/bin/python \
+                --suffix PATH : ${python}/bin/python
   '';
 
 in
 
 callPackage ./common.nix {
-  inherit julia;
-
-  # Run Pkg.precompile() to precompile all packages?
-  precompile = true;
-
-  # Extra arguments to makeWrapper when creating the final Julia wrapper.
-  # By default, it will just put the new depot at the end of JULIA_DEPOT_PATH.
-  # You can add additional flags here.
-  makeWrapperArgs = "";
-
-  # Extra buildInputs for building the Julia depot. Useful if your packages have
-  # additional build-time dependencies not managed through the Artifacts.toml system.
-  # Defaults to extraLibs, but can be configured independently.
-  extraBuildInputs = extraLibs;
+  inherit julia extraLibs precompile makeWrapperArgs;
 }