diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-11-16 16:49:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 16:49:00 +0100 |
| commit | d0925412b659d1761b3603693d366b0b50eb9a7c (patch) | |
| tree | 53078943e707ca6d085fa351eeec9f4060bdc84f /pkgs/tools/X11 | |
| parent | 474c2d4c09b254c22e0d668c40b2caa679cf8852 (diff) | |
| parent | 68559e2820ece9eef44753441bd24b6de6947e56 (diff) | |
| download | nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.tar nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.tar.gz nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.tar.bz2 nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.tar.lz nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.tar.xz nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.tar.zst nixlib-d0925412b659d1761b3603693d366b0b50eb9a7c.zip | |
Merge pull request #95675 from erikarvstedt/fix-sdg-utils
xdg-utils: add missing dependencies
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index ccea6a2233cc..85d87d9e36d6 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -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; { |