JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opam: put the whole /nix in OPAM_USER_PATH_RO

Browse Source 
Some symlinks point to /nix/var/profiles/per-user/…, these have be
readable too.
This commit is contained in:
Uma Zalakain 2019-03-09 14:20:58 +01:00
parent 84be644f87
commit 83e6a1c996
No known key found for this signature in database
GPG Key ID: 022D8B2AA9A950D5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/ocaml/opam/default.nix
View File

@ -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
'';

2
pkgs/development/tools/ocaml/opam/opam.nix.pl
View File

@ -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
'';