xdg_utils: fix replacement of which with type -P #14674
Closed
+1
−1
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
|
Hm, seeing some file not found errors in the travis build log, possibly a legit error. |
| @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { | |||
| substituteInPlace $out/bin/xdg-mime \ | |||
| --replace "/usr/bin/file" "${file}/bin/file" | |||
| sed 's# which # type -P #g' -i "$out"/bin/* | |||
There was a problem hiding this comment.
This adds a space in front of things like:
`which "$command"` -> ` type -P "$command"`
Something like this covers all of the cases:
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index e7233d0..63073ad 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/file" "${file}/bin/file"
sed 's# which # type -P #g' -i "$out"/bin/*
+ sed 's#`which #`type -P #g' -i "$out"/bin/*
'';
meta = with stdenv.lib; {
|
Fixes NixOS/nixos#301 |
|
Should be fixed according to NixOS/nixos#301. |
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.
Before, the postInstall in xdg_utils failed to properly replace all instances of
whichwithtype -Pdue to some errant spaces in the sed command. This fixes the problem (hopefully).I'm lazy and I don't have a local copy of the nixpkgs repo at the moment, so I haven't really tested this yet, but I have tested a similar fix using
overrideDerivation, so it'll probably work. ;)Things done
nix-build --option build-use-chroot trueor nix.useChroot on NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)