Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/fish: Fix foreign-env function path #110689

Merged
merged 1 commit into from Jan 24, 2021

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Jan 24, 2021

Motivation for this change

Fix the broken foreign-env path in the sourceEnv function of fish.nix. Without the fix I get errors like these:

/etc/fish/config.fish (line 6): 
fenv source /etc/fish/foreign-env/shellInit > /dev/null
^
from sourcing file /etc/fish/config.fish
	called on line 39 of file /nix/store/j6k8pvb73n68landa81c173fx45qn4q5-fish-3.1.2/etc/fish/config.fish
from sourcing file /nix/store/j6k8pvb73n68landa81c173fx45qn4q5-fish-3.1.2/etc/fish/config.fish
	called during startup
/etc/fish/config.fish (line 40): 
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
^
from sourcing file /etc/fish/config.fish
	called on line 39 of file /nix/store/j6k8pvb73n68landa81c173fx45qn4q5-fish-3.1.2/etc/fish/config.fish
from sourcing file /nix/store/j6k8pvb73n68landa81c173fx45qn4q5-fish-3.1.2/etc/fish/config.fish
	called during startup
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@kevingriffin kevingriffin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks correct to me. Sorry for the oversight here! This makes it match line 166, which is working.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants