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

filezilla: add wrapper to set necessary FZ_DATADIR #62340

Merged
merged 1 commit into from Jun 9, 2019

Conversation

khumba
Copy link
Contributor

@khumba khumba commented Jun 1, 2019

Motivation for this change

Filezilla fails to start currently, with the following message being
shown in a lone dialog before the program exits:

Could not find the resource files for FileZilla, closing FileZilla.
You can set the data directory of FileZilla using the '--datadir
' commandline option or by setting the FZ_DATADIR
environment variable.

This commit adds a wrapper for the filezilla binary to set the
environment variable to the package root, which fixes the issue.

This commit also sets enableParallelBuilding = true. It greatly
reduces build time, and the build isn't deterministic anyway.

(This affects master, but I would also like to request that this change be pushed to release-19.03, since Filezilla is also broken there. How can I go about doing that? Thanks.)

CC maintainer @pSub.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
    • /nix/store/sw1qk0z4k7lzlmv5lcc1gkmnqyzkax2z-filezilla-3.31.0 194782168
      /nix/store/a3kvy3cp6ylhlhiwq4algf03h96dgh06-filezilla-3.31.0 194782688
  • Assured whether relevant documentation is up to date
    • No documentation found in doc/.
  • Fits CONTRIBUTING.md.

Filezilla fails to start currently, with the following message being
shown in a lone dialog before the program exits:

> Could not find the resource files for FileZilla, closing FileZilla.
> You can set the data directory of FileZilla using the '--datadir
> <custompath>' commandline option or by setting the FZ_DATADIR
> environment variable.

This commit adds a wrapper for the filezilla binary to set the
environment variable to the package root, which fixes the issue.
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

This commit also sets enableParallelBuilding = true.

The commit itself does not do that or claim to do that, so I added that change as an additional commit.

@vcunat vcunat merged commit 61940b8 into NixOS:master Jun 9, 2019
vcunat added a commit that referenced this pull request Jun 9, 2019
@vcunat
Copy link
Member

vcunat commented Jun 9, 2019

Pushed to 19.03, too, after quick re-test.

vcunat added a commit that referenced this pull request Jun 9, 2019
This reverts commit 61940b8 #62340.
Apparently it's not needed anymore after the update, so let me clean up.
@khumba khumba deleted the filezilla branch August 30, 2019 15:59
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