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: 92f1c50dabfb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e379117c459
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 17, 2020

  1. google-chrome: add coreutils to PATH

    google-chrome-stable can't run without coreutils in PATH
    
    (cherry picked from commit e8ddc0c)
    grahamc committed Jun 17, 2020
    Copy the full SHA
    725c4fd View commit details
  2. xdg_utils: xdg-open: add $out to PATH

    Otherwise, xdg-open cannot call xdg-mime and this does not work:
    
        "${pkgs.xdg_utils}/bin/xdg-open"
    
    (cherry picked from commit 4b5880f)
    grahamc committed Jun 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    9e37911 View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −1 pkgs/applications/networking/browsers/google-chrome/default.nix
  2. +1 −0 pkgs/tools/X11/xdg-utils/default.nix
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa

# Command line programs
, coreutils

# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""

@@ -58,7 +61,7 @@ let
liberation_ttf curl utillinux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa
kerberos libdrm mesa coreutils
] ++ optional pulseSupport libpulseaudio
++ [ gtk ];

1 change: 1 addition & 0 deletions pkgs/tools/X11/xdg-utils/default.nix
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
PATH=$PATH:'"$out"'/bin\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \