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

freecad: move docs to correct location #62442

Merged
merged 1 commit into from Jun 11, 2019
Merged

Conversation

lightbulbjim
Copy link
Contributor

Motivation for this change

Move the help files to the location which the help viewer expects,
otherwise attempting to access help from the menus gives an error.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Move the help files to the location which the help viewer expects,
otherwise attempting to access help from the menus gives an error.
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.

Well, putting the help files directly into root of the installation isn't very nice, as they will get symlinked into environments this way. Isn't there some easy way of overriding the path that is searched for help files?

@lightbulbjim
Copy link
Contributor Author

lightbulbjim commented Jun 11, 2019

Well, putting the help files directly into root of the installation isn't very nice, as they will get symlinked into environments this way. Isn't there some easy way of overriding the path that is searched for help files?

While I agree in part, this is the pattern that FreeCAD follows (it's not really FHS compliant). These are the directories created in the current version:

$ ls -l /nix/store/rgg0d1rmc1wb6l8fybsanxpjsf05k5y9-freecad-0.18.2/
total 24
dr-xr-xr-x  2 root root 4096 Jan  1  1970 bin
dr-xr-xr-x  5 root root 4096 Jan  1  1970 data
dr-xr-xr-x  3 root root 4096 Jan  1  1970 Ext
dr-xr-xr-x  2 root root 4096 Jan  1  1970 lib
dr-xr-xr-x 35 root root 4096 Jan  1  1970 Mod
dr-xr-xr-x  7 root root 4096 Jan  1  1970 share

The doc directory would be there too except the fixup phase moves it to $out/share/doc.

Another approach would be to have a subdirectory like $out/freecad that all the resource directories get created in. Happy to look into that (presumably it's possible by just setting the install prefix, but I haven't investigated yet).

@vcunat
Copy link
Member

vcunat commented Jun 11, 2019

Oh, the doc in package root isn't that bad... I somehow thought it would be one level lower.

I should've written I can't really test it, as for me it won't start up at all, regardless of this PR:

failed to create drawable
[xcb] Unknown sequence number while processing queue
[xcb] Most likely this is a multi-threaded client and XInitThreads has not been called
[xcb] Aborting, sorry about that.
FreeCAD: xcb_io.c:263: poll_for_event: Assertion `!xcb_xlib_threads_sequence_lost' failed.

@gebner
Copy link
Member

gebner commented Jun 11, 2019

@vcunat Try env LIBGL_DRI3_DISABLE=true FreeCAD --- see here: https://forum.freecadweb.org/viewtopic.php?t=28054 I have the same problem with amdgpu.

@lightbulbjim
Copy link
Contributor Author

FWIW I don't get that error using Intel graphics on Wayland.

@vcunat
Copy link
Member

vcunat commented Jun 11, 2019

Hmm, OK, it was amdgpu for me as well. Intel skylake + X seems fine as it is. Perhaps we should use a wrapper to set this variable? Do you know about any down-sides? (I haven't read that forum thread properly, at least not yet.)

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.

I see no reason to wait with this PR. We can improve later.

markuskowa pushed a commit to markuskowa/nixpkgs that referenced this pull request Jun 11, 2019
@vcunat vcunat merged commit 5f968f3 into NixOS:master Jun 11, 2019
@lightbulbjim lightbulbjim deleted the freecad-docs branch June 11, 2019 11:31
@gebner gebner mentioned this pull request Jun 17, 2019
10 tasks
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

3 participants