st: copy config file in 'prePatch' instead of 'preBuild' #85055
Conversation
The patch phase runs after the build phase. Which means than when using an override to override both 'conf' and 'patches' to provide a custom config file and apply some patches, it doesn't work: - first the patches applied (optionally changing config.def.h) - then preBuild is run which overrides config.def.h with the user supplied one (effectively cancelling previously applied patches) By copying the config file in the prePatch phase instead, changes are kept and applied in order.
ofborg
bot
added
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
10.rebuild-linux: 1
labels
|
@nschoe Hi, it seems you've opened your PR to merge into |
|
I've tested that it builds and works with WSL and nix. If you fix the target branch (mentioned by @worldofpeace ) I'm good with the change. |
|
@andsild I'm confused why though, the ordering of phases "The patch phase runs after the build phase." isn't true for genericBuild. https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L1261 |
|
@worldofpeace thanks for answering. Sorry I was not sure if I had to target I guess i have to rebase first when targetting @Mic92 hum... I see what you mean, I'm not an expert on this. But if the patches don't change the same parts the user changed himself, it should be fine. Otherwise, I believe this to be a I guess @andsild might be the one able to answer? FWIW, I've used this in my (st.override {
# st is configured with a config.h file, use this one
conf = builtins.readFile /home/nschoe/.config/st/config.h;
patches = [
# Allows scrolling the screen with Shift+Pg{Up,Down}
(builtins.fetchurl { url = https://st.suckless.org/patches/scrollback/st-scrollback-0.8.2.diff ; })
# Allows scrolling the screen with Shift+Mouse{Up,Down}
(builtins.fetchurl { url = https://st.suckless.org/patches/scrollback/st-scrollback-mouse-0.8.2.diff ; })
# Two patches to install solarized themes
(builtins.fetchurl { url = https://st.suckless.org/patches/solarized/st-no_bold_colors-0.8.1.diff ; })
(builtins.fetchurl { url = https://st.suckless.org/patches/solarized/st-solarized-both-20190128-3be4cf1.diff ; })
];
})I have modified the Well as I said: this is my first ever contribution to Thanks to you all. |
|
I rebased your patch to master: #85443 |
The patch phase runs after the build phase. Which means than when
using an override to override both
confandpatchesto providea custom config file and apply some patches, it doesn't work:
config.def.h)preBuildis run which overridesconfig.def.hwith the usersupplied one (effectively cancelling previously applied patches)
By copying the config file in the
prePatchphase instead, changesare kept and applied in order.
This is my first ever contribution to nixpkgs, so I hope I'm not mistaken.
cc @andsild
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)