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: 7105bb68cc77
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84fb41dd2698
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 10, 2017

  1. chromium: fix .desktop file name 

    The desktop file must be name "chromium-browser.desktop" because it is
used as-is when setting chromium as the default browser.

See https://cs.chromium.org/chromium/src/chrome/browser/shell_integration_linux.cc?l=657&rcl=34b92857a547538555be6a38e95f7e95ab9b6842

fixes #23518
    @layus @bendlas
    layus authored and bendlas committed Nov 10, 2017
    Copy the full SHA
    c7f00e3 View commit details

  2. chromium: hardcode xdg_utils path in system calls 

    ref #23518
    @layus @bendlas
    layus authored and bendlas committed Nov 10, 2017
    Copy the full SHA
    84fb41d View commit details
Showing with 4 additions and 1 deletion.
  1. +3 −0 pkgs/applications/networking/browsers/chromium/common.nix
  2. +1 −1 pkgs/applications/networking/browsers/chromium/default.nix
3 changes: 3 additions & 0 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -160,6 +160,9 @@ let
'return sandbox_binary;' \
'return base::FilePath(GetDevelSandboxPath());'
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
device/udev_linux/udev?_loader.cc
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/chromium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ let
};

desktopItem = makeDesktopItem {
name = "chromium";
name = "chromium-browser";
exec = "chromium %U";
icon = "chromium";
comment = "An open source web browser from Google";