gvfs: Fix-up paths to gio binary #48548
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukateras
reviewed
Oct 16, 2018
There was a problem hiding this comment.
As of current nixos-unstable, gio is in glib.bin, not glib.dev:
$ ls $(nix-build '<nixpkgs>' -A glib.bin --no-out-link)/bin
gapplication gdbus gio gsettings
$ ls $(nix-build '<nixpkgs>' -A glib.dev --no-out-link)/bin
gdbus-codegen gio-querymodules glib-compile-resources glib-compile-schemas glib-genmarshal glib-gettextize glib-mkenums gobject-query gresource gtester gtester-report
clefru
force-pushed
the
gvfs-fix-on-master
branch
from
5b77d89
to
e3465c6
Compare
|
@yegortimoshenko Thanks you are right. I did not properly test this after my cherry-pick from 18.09 into master. |
lukateras
reviewed
Oct 16, 2018
| @@ -82,6 +82,9 @@ stdenv.mkDerivation rec { | |||
| doInstallCheck = doCheck; | |||
|
|
|||
| preFixup = '' | |||
| for f in $out/bin/*; do | |||
| sed -i -e 's#exec $replacement#exec ${glib.bin}/bin/$replacement#' $f | |||
There was a problem hiding this comment.
Maybe:
substituteInPlace --replace 'exec $replacement' 'exec ${glib.bin}/bin/$replacement'
|
gvfs utilities were removed in glib 2.58, making this moot. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
#48547
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)