Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34ff87e288e0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 656288f7bfef
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 17, 2018

  1. gnome3.gnome-desktop: fix path substitution 

    `substituteAll` intentionally doesn't work with all caps:
#28086
    @hedning
    hedning committed Nov 17, 2018
    Copy the full SHA
    35c64e5 View commit details

  2. Merge pull request #50507 from hedning/fix-nautilus-thumbnails 

    gnome3.gnome-desktop: fix path substitution
    @jtojnar
    jtojnar authored Nov 17, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    656288f View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
  2. +1 −1 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./bubblewrap-paths.patch;
BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap";
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
})
];