commit ec4a8bb4b4d6b88a824b6d58888018d8331db4ba · pyrox.dev/nixpkgs

+4 -2

pkgs/shells/fish-foreign-env/default.nix

···

       11
       11
        
           sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildCommand = ''

     

       14
       14
       +
         installPhase = ''

     

       15
       15
        
           mkdir -p $out/share/fish-foreign-env/functions/

     

       16
       16
       -
           cp $src/functions/* $out/share/fish-foreign-env/functions/

     

       16
       16
       +
           cp functions/* $out/share/fish-foreign-env/functions/

     

       17
       17
        
           sed -e "s|sed|${gnused}/bin/sed|" \

     

       18
       18
        
               -e "s|bash|${bash}/bin/bash|" \

     

       19
       19
        
               -e "s|\| tr|\| ${coreutils}/bin/tr|" \

     

       20
       20
        
               -i $out/share/fish-foreign-env/functions/*

     

       21
       21
        
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         patches = [ ./hide-path-warnings.patch ];

     

       22
       24
        
       

     

       23
       25
        
         meta = with stdenv.lib; {

     

       24
       26
        
           description = "A foreign environment interface for Fish shell";

+16

pkgs/shells/fish-foreign-env/hide-path-warnings.patch

···

       1
       1
       +
       diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish

     

       2
       2
       +
       index 34a25e3..6837e7f 100644

     

       3
       3
       +
       --- a/functions/fenv.apply.fish

     

       4
       4
       +
       +++ b/functions/fenv.apply.fish

     

       5
       5
       +
       @@ -30,8 +30,9 @@ function fenv.apply

     

       6
       6
       +
        

     

       7
       7
       +
                if test "$key" = 'PATH'

     

       8
       8
       +
                  set value (echo $value | tr ':' '\n')

     

       9
       9
       +
       +          set -g -x $key $value ^/dev/null

     

       10
       10
       +
       +        else

     

       11
       11
       +
       +          set -g -x $key $value

     

       12
       12
       +
                end

     

       13
       13
       +
       -

     

       14
       14
       +
       -        set -g -x $key $value

     

       15
       15
       +
            end

     

       16
       16
       +
        end