From 83e6a1c99667dc7e0839b8b36e213d7e238511d7 Mon Sep 17 00:00:00 2001 From: Uma Zalakain Date: Sat, 9 Mar 2019 14:20:58 +0100 Subject: [PATCH] opam: put the whole /nix in OPAM_USER_PATH_RO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some symlinks point to /nix/var/profiles/per-user/…, these have be readable too. --- pkgs/development/tools/ocaml/opam/default.nix | 2 +- 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 '';