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

gnome3.gnome-desktop: fix path substitution

Browse Source 
`substituteAll` intentionally doesn't work with all caps:
https://github.com/NixOS/nixpkgs/issues/28086
This commit is contained in:
Tor Hedin Brønner 2018-11-17 16:06:27 +01:00 committed by Jan Tojnar
parent 10f8039990
commit d5ba27a700
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
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/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
View File

@ -8,7 +8,7 @@
- "--ro-bind", "/usr", "/usr", - "--ro-bind", "/usr", "/usr",
- "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib", "/lib",
- "--ro-bind", "/lib64", "/lib64", - "--ro-bind", "/lib64", "/lib64",
+ "@BUBBLEWRAP_BIN@", + "@bubblewrap_bin@",
+ "--ro-bind", "/nix/store", "/nix/store", + "--ro-bind", "/nix/store", "/nix/store",
"--proc", "/proc", "--proc", "/proc",
"--dev", "/dev", "--dev", "/dev",

2
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./bubblewrap-paths.patch; src = ./bubblewrap-paths.patch;
BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap"; bubblewrap_bin = "${bubblewrap}/bin/bwrap";
}) })
]; ];