diff options
author | Uma Zalakain <uma@gisa-elkartea.org> | 2019-03-09 14:20:58 +0100 |
---|---|---|
committer | Uma Zalakain <uma@gisa-elkartea.org> | 2019-03-11 01:02:43 +0100 |
commit | 83e6a1c99667dc7e0839b8b36e213d7e238511d7 (patch) | |
tree | 1f617e893eb1c5316c7e3dffe8034765aa5fa709 /pkgs/development/tools/ocaml/opam | |
parent | 84be644f87493ab5bc874580c1d45d7635d6547f (diff) | |
download | nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.tar nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.tar.gz nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.tar.bz2 nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.tar.lz nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.tar.xz nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.tar.zst nixpkgs-83e6a1c99667dc7e0839b8b36e213d7e238511d7.zip |
opam: put the whole /nix in OPAM_USER_PATH_RO
Some symlinks point to /nix/var/profiles/per-user/…, these have be readable too.
Diffstat (limited to 'pkgs/development/tools/ocaml/opam')
-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 b3e9e71ebc0..a7f06e73453 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 537997eb8a4..59a1cd223b5 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 ''; |