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

fish-foreign-env: hide warnings when setting PATH

Browse Source
This commit is contained in:
rnhmjoj 2017-07-08 04:27:18 +02:00
parent 93b1b3d6e6
commit cca61e0371
No known key found for this signature in database
GPG Key ID: 91BE884FBA4B591A
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/shells/fish-foreign-env/default.nix
View File

@ -11,15 +11,17 @@ stdenv.mkDerivation rec {
sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl"; sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl";
}; };
buildCommand = '' installPhase = ''
mkdir -p $out/share/fish-foreign-env/functions/ mkdir -p $out/share/fish-foreign-env/functions/
cp $src/functions/* $out/share/fish-foreign-env/functions/ cp functions/* $out/share/fish-foreign-env/functions/
sed -e "s|sed|${gnused}/bin/sed|" \ sed -e "s|sed|${gnused}/bin/sed|" \
-e "s|bash|${bash}/bin/bash|" \ -e "s|bash|${bash}/bin/bash|" \
-e "s|\| tr|\| ${coreutils}/bin/tr|" \ -e "s|\| tr|\| ${coreutils}/bin/tr|" \
-i $out/share/fish-foreign-env/functions/* -i $out/share/fish-foreign-env/functions/*
''; '';
patches = [ ./hide-path-warnings.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A foreign environment interface for Fish shell"; description = "A foreign environment interface for Fish shell";
license = licenses.mit; license = licenses.mit;

16
pkgs/shells/fish-foreign-env/hide-path-warnings.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish
index 34a25e3..6837e7f 100644
--- a/functions/fenv.apply.fish
+++ b/functions/fenv.apply.fish
@@ -30,8 +30,9 @@ function fenv.apply
if test "$key" = 'PATH'
set value (echo $value | tr ':' '\n')
+ set -g -x $key $value ^/dev/null
+ else
+ set -g -x $key $value
end
-
- set -g -x $key $value
end
end