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.

Sign up for GitHub

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

Jump to bottom

spacefm: fix segfault by exporting shared-mime-info/share in XDG_DATA_DIRS #36797

Merged
merged 1 commit into from Mar 18, 2018
Merged

spacefm: fix segfault by exporting shared-mime-info/share in XDG_DATA_DIRS #36797

merged 1 commit into from Mar 18, 2018

Conversation

nioncode
Copy link
Member

@nioncode nioncode commented Mar 11, 2018 •
edited

Motivation for this change

Fixes #31797.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@nioncode nioncode mentioned this pull request Mar 11, 2018
Closed
jtojnar
jtojnar requested changes Mar 11, 2018
View reviewed changes
pkgs/applications/misc/spacefm/default.nix Outdated
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
'';

postFixup = ''
wrapProgram $out/bin/spacefm \
Copy link
Contributor

Choose a reason for hiding this comment

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

wrapGAppsHook already wraps the executable, please use

nixpkgs/pkgs/applications/graphics/gthumb/default.nix

Lines 26 to 28 in 532bd71

preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';

@nioncode
Copy link
Member Author

I'm now using gappsWrapperArgs as requested and rebased the branch and force pushed the changes. Is this the correct approach or do you like to merge the whole history usually to keep the reviews working?

@jtojnar
Copy link
Contributor

jtojnar commented Mar 12, 2018

For larger pull requests, it is usually better to delay rebasing until before the merge; for smaller ones like this one, force pushing is fine and leads to less round trips.

@gebner gebner merged commit a807035 into NixOS:master Mar 18, 2018
@nioncode nioncode deleted the spacefm branch March 18, 2018 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nioncode @jtojnar @gebner @GrahamcOfBorg