diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-03-23 20:58:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 20:58:38 +0100 |
| commit | a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b (patch) | |
| tree | 50370732efd4441dc251c46c185e20fbf3772147 /pkgs/development/tools/ocaml | |
| parent | 44464523477c6f111f9f89794b3b7fcb730ce5c6 (diff) | |
| parent | 83e6a1c99667dc7e0839b8b36e213d7e238511d7 (diff) | |
| download | nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.tar nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.tar.gz nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.tar.bz2 nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.tar.lz nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.tar.xz nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.tar.zst nixlib-a7a4fc2efe6b9137b8ff334cede779d41c1cfb4b.zip | |
Merge pull request #57118 from umazalakain/opam-nix-user-path
opam: put the whole /nix in OPAM_USER_PATH_RO
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/development/tools/ocaml/opam/opam.nix.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b3e9e71ebc05..a7f06e734530 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 537997eb8a45..59a1cd223b5d 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -114,7 +114,7 @@ print <<'EOF'; makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; |