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

gvfs: Fix-up paths to gio binary #48827

Merged
merged 1 commit into from Nov 2, 2018
Merged

Conversation

clefru
Copy link
Contributor

@clefru clefru commented Oct 22, 2018

Motivation for this change

#48547

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@@ -82,6 +82,9 @@ stdenv.mkDerivation rec {
doInstallCheck = doCheck;

preFixup = ''
for f in $out/bin/*; do
substituteInPlace $f --replace 'exec $replacement' 'exec ${glib.dev}/bin/$replacement'
Copy link
Contributor

Choose a reason for hiding this comment

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

How does replacing $replacement work?

Copy link
Member

Choose a reason for hiding this comment

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

No magic: $replacement is just a shell variable reference inside the script, and it is always a shell command (starting with gio)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jtojnar see top of #48547

@7c6f434c 7c6f434c merged commit dbda176 into NixOS:release-18.09 Nov 2, 2018
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

4 participants