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: 474c2d4c09b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0925412b659
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 17, 2020

  1. xdg-utils: add missing dependencies 

    - Add coreutils to PATH, because the xdg scripts use other not yet
  provided coreutils like head.
  This makes the custom 'cut' and 'sort' functions obsolete.
  Remove double quotes around $out because $out contains no Bash field separators.
- Replace all instances of 'which' with 'type -P'.
  The previous sed command only replaced instances with a leading space.
    @erikarvstedt
    erikarvstedt committed Aug 17, 2020
    Copy the full SHA
    68559e2 View commit details

Commits on Nov 16, 2020

  1. Merge pull request #95675 from erikarvstedt/fix-sdg-utils 

    xdg-utils: add missing dependencies
    @Mic92
    Mic92 authored Nov 16, 2020
    Copy the full SHA
    d092541 View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 pkgs/tools/X11/xdg-utils/default.nix
6 changes: 2 additions & 4 deletions pkgs/tools/X11/xdg-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,17 +36,15 @@ stdenv.mkDerivation rec {
cp ${mimisrc}/xdg-open $out/bin/xdg-open
'' + ''
sed '2s#.#\
cut() { ${coreutils}/bin/cut "$@"; }\
sed() { ${gnused}/bin/sed "$@"; }\
grep() { ${gnugrep}/bin/grep "$@"; }\
egrep() { ${gnugrep}/bin/egrep "$@"; }\
file() { ${file}/bin/file "$@"; }\
awk() { ${gawk}/bin/awk "$@"; }\
sort() { ${coreutils}/bin/sort "$@"; }\
xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
PATH=$PATH:'"$out"'/bin\
PATH=$PATH:'$out'/bin:${coreutils}/bin\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \
@@ -58,7 +56,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/xdg-email \
--replace "/bin/echo" "${coreutils}/bin/echo"
sed 's# which # type -P #g' -i "$out"/bin/*
sed 's|\bwhich\b|type -P|g' -i "$out"/bin/*
'';

meta = with stdenv.lib; {