-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
gimp: fix all plugins build #25393
gimp: fix all plugins build #25393
Conversation
@avnik, thanks for your PR! By analyzing the history of the files in this pull request, we identified @cillianderoiste, @MarcWeber and @edolstra to be potential reviewers. |
buildInputs = with pkgs; [ | ||
fftw | ||
autoreconfHook | ||
intltool |
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.
autoreconfHook and intltool belong to nativeBuildInputs
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.
intltool is enough common for most plugins, should it be default?
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.
could be.
src = fetchurl { | ||
url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz; | ||
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; | ||
}; | ||
buildInputs = with pkgs; [ intltool perl ]; |
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.
intltool belongs to nativeBuildInputs
@@ -156,7 +159,7 @@ rec { | |||
Filters/Enhance/Wavelet sharpen | |||
*/ | |||
name = "wavelet-sharpen-0.1.2"; | |||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; | |||
buildInputs = with pkgs; [ intltool ]; |
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.
same here.
@@ -169,7 +172,7 @@ rec { | |||
Layer/Liquid Rescale | |||
*/ | |||
name = "lqr-plugin-0.6.1"; | |||
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs; | |||
buildInputs = with pkgs; [ intltool libLQR ]; |
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.
same here.
// { name = "${a.name}-${gimp.name}-plugin"; } | ||
// { | ||
name = "${a.name}-${gimp.name}-plugin"; | ||
buildInputs = [ gimp gimp.gtk glib pkgconfig ] ++ (a.buildInputs or []); |
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.
pkgconfig
belongs to nativeBuildInputs.
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.
Thinked about split nativeBuildInputs, but was urge to rebuild my system. Will do.
@Mic92 all stuff you requested was fixed |
It used by gimp itself (so should be already present on machine builds gimp+plugins) and 90% of plugins.
@Mic92 also promoted intltool as default build input, I think it ready to merge |
Motivation for this change
Some plugins was broken, and prevent build gimp with all plugins installed
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)