public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
xdg-utils: add missing dependencies
This commit is contained in:
Jörg Thalheim 2020-11-16 16:49:00 +01:00 committed by GitHub
commit d0925412b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/X11/xdg-utils/default.nix
View File

@ -36,17 +36,15 @@ stdenv.mkDerivation rec {
cp ${mimisrc}/xdg-open $out/bin/xdg-open cp ${mimisrc}/xdg-open $out/bin/xdg-open
'' + '' '' + ''
sed '2s#.#\ sed '2s#.#\
cut() { ${coreutils}/bin/cut "$@"; }\
sed() { ${gnused}/bin/sed "$@"; }\ sed() { ${gnused}/bin/sed "$@"; }\
grep() { ${gnugrep}/bin/grep "$@"; }\ grep() { ${gnugrep}/bin/grep "$@"; }\
egrep() { ${gnugrep}/bin/egrep "$@"; }\ egrep() { ${gnugrep}/bin/egrep "$@"; }\
file() { ${file}/bin/file "$@"; }\ file() { ${file}/bin/file "$@"; }\
awk() { ${gawk}/bin/awk "$@"; }\ awk() { ${gawk}/bin/awk "$@"; }\
sort() { ${coreutils}/bin/sort "$@"; }\
xset() { ${xset}/bin/xset "$@"; }\ xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\ mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
PATH=$PATH:'"$out"'/bin\ PATH=$PATH:'$out'/bin:${coreutils}/bin\
&#' -i "$out"/bin/* &#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \ substituteInPlace $out/bin/xdg-open \
@ -58,7 +56,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/xdg-email \ substituteInPlace $out/bin/xdg-email \
--replace "/bin/echo" "${coreutils}/bin/echo" --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; { meta = with stdenv.lib; {