-
-
Notifications
You must be signed in to change notification settings - Fork 13.9k
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
tmux-thumbs: init at 0.7.1 #162121
tmux-thumbs: init at 0.7.1 #162121
Conversation
ea6a94d
to
dfd7745
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both diffs also apply to your other derivation
Thanks!
30f5460
to
efc7b2a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You forgot to apply the changes suggested by legendofmiracles to this file too.
After this, its good. Thanks
PS: I havent actually tested it as I dont have the means, but it looks good and builds. So, im assuming that it works for you
Oh I see, sorry got lost a little bit. I will fix the in a minute. Many thanks for the review! |
b96d9d0
to
5b27f60
Compare
Yes, I use it all the time, and my setup is based on this particular changes. |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
pkgs/tools/misc/thumbs/default.nix
Outdated
patches = [ ./fix.patch ]; | ||
postPatch = '' | ||
substituteInPlace src/swapper.rs --replace '@@thumbs-bin-dir@@' $out/bin | ||
''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please combine this like
nixpkgs/pkgs/applications/audio/curseradio/default.nix
Lines 20 to 25 in 51ceca2
patches = [ | |
(substituteAll { | |
src = ./mpv.patch; | |
inherit mpv; | |
}) | |
]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure if it is possible, at last I haven't found a way to do this. The substitution uses out
but I cannot use it as a nix variable because the derivation hasn't been created yet.
Following code correctly complains about out
being undefined:
patches = [
(substituteAll {
src = ./fix.patch;
thumbsBinDir = "${out}/bin";
})
];
Am I missing something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think one of the following should work:
patches = [
(substituteAll {
src = ./fix.patch;
thumbsBinDir = "$out/bin";
})
];
or
patches = [
(substituteAll {
src = ./fix.patch;
thumbsBinDir = "${placeholder "out"}/bin";
})
];
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, neither of them works. My debugging capabilities of that are very limited but I was about to observe following errors:
With first solution:
patches = [
(substituteAll {
src = ./fix.patch;
thumbsBinDir = "$out/bin";
})
];
Not a directory : $out/bin/thumbs
With second solution:
patches = [
(substituteAll {
src = ./fix.patch;
thumbsBinDir = "${placeholder "out"}/bin";
})
];
Not a directory: /nix/store/some-hash-fix.patch/bin/thumbs
Could it be possible that in the second case we somehow refer to the output of the substituteAll
function?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SuperSandro2000 I managed to get rid completely of this one substitute
:)
d190dac
to
44e5145
Compare
e92d08f
to
c486aca
Compare
0cee6b8
to
47ed76c
Compare
47ed76c
to
2355463
Compare
Come on ;_; why didn't you mention this PR in #161792? I've made a duplicate PR now. Closing it. |
@papojari Sorry, my bad. I've just simply forgot to do that. Thanks. |
Motivation for this change
Add https://github.com/fcsonline/tmux-thumbs
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes