diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-11-17 16:06:27 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:35:26 +0100 |
| commit | d5ba27a70082bcd465258a83087f7ad4292593ac (patch) | |
| tree | 625b92217385a16fd5dba8059e47510d04eb372e /pkgs | |
| parent | 10f8039990eed03a8f6c0b34d8314993b9193275 (diff) | |
| download | nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.tar nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.tar.gz nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.tar.bz2 nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.tar.lz nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.tar.xz nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.tar.zst nixpkgs-d5ba27a70082bcd465258a83087f7ad4292593ac.zip | |
gnome3.gnome-desktop: fix path substitution
`substituteAll` intentionally doesn't work with all caps: https://github.com/NixOS/nixpkgs/issues/28086
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index ee9b012b6e4..59191bddd9a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -8,7 +8,7 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib64", "/lib64", -+ "@BUBBLEWRAP_BIN@", ++ "@bubblewrap_bin@", + "--ro-bind", "/nix/store", "/nix/store", "--proc", "/proc", "--dev", "/dev", diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index f5973d3800b..b283454b5c0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./bubblewrap-paths.patch; - BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap"; + bubblewrap_bin = "${bubblewrap}/bin/bwrap"; }) ]; |