diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-08 16:17:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 16:17:20 +0100 |
| commit | ec4a8bb4b4d6b88a824b6d58888018d8331db4ba (patch) | |
| tree | 053c1a5638461731573e7d2990d1bb85147492ec | |
| parent | 3a227e673abc5935f3aaa7a7350da54f52172924 (diff) | |
| parent | cca61e0371fd1d0293d9c4dfcac05402da1f5e77 (diff) | |
| download | nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.tar nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.tar.gz nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.tar.bz2 nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.tar.lz nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.tar.xz nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.tar.zst nixlib-ec4a8bb4b4d6b88a824b6d58888018d8331db4ba.zip | |
Merge pull request #27227 from rnhmjoj/fish
fish-foreign-env: hide warnings when setting PATH
| -rw-r--r-- | pkgs/shells/fish-foreign-env/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/fish-foreign-env/hide-path-warnings.patch | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix index 477c103c095e..76a979bcda1b 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/pkgs/shells/fish-foreign-env/default.nix @@ -11,15 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl"; }; - buildCommand = '' + installPhase = '' 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|" \ -e "s|bash|${bash}/bin/bash|" \ -e "s|\| tr|\| ${coreutils}/bin/tr|" \ -i $out/share/fish-foreign-env/functions/* ''; + patches = [ ./hide-path-warnings.patch ]; + meta = with stdenv.lib; { description = "A foreign environment interface for Fish shell"; license = licenses.mit; diff --git a/pkgs/shells/fish-foreign-env/hide-path-warnings.patch b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch new file mode 100644 index 000000000000..b7ac4edc5189 --- /dev/null +++ b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch @@ -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 |