alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gimp: promote intltool to default nativeBuildDepends

Browse source 
It used by gimp itself (so should be already present on machine builds
gimp+plugins) and 90% of plugins.
This commit is contained in:
Alexander V. Nikolaev 2017-05-04 16:44:59 +03:00
parent 8452e0684e
commit db82435660
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/graphics/gimp/plugins/default.nix
View file

@ -5,7 +5,7 @@
{ pkgs, gimp }: { pkgs, gimp }:
let let
inherit (pkgs) stdenv fetchurl pkgconfig glib fetchFromGitHub; inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub;
inherit (gimp) targetPluginDir targetScriptDir; inherit (gimp) targetPluginDir targetScriptDir;
pluginDerivation = a: stdenv.mkDerivation ({ pluginDerivation = a: stdenv.mkDerivation ({
@ -26,7 +26,7 @@ let
// { // {
name = "${a.name}-${gimp.name}-plugin"; name = "${a.name}-${gimp.name}-plugin";
buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
nativeBuildInputs = [ pkgconfig ] ++ (a.nativeBuildInputs or []); nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
} }
); );
@ -51,7 +51,6 @@ rec {
Video Video
*/ */
name = "gap-2.6.0"; name = "gap-2.6.0";
nativeBuildInputs = with pkgs; [ intltool ];
src = fetchurl { src = fetchurl {
url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@ -91,7 +90,6 @@ rec {
*/ */
name = "focusblur-3.2.6"; name = "focusblur-3.2.6";
buildInputs = with pkgs; [ fftwSinglePrec ]; buildInputs = with pkgs; [ fftwSinglePrec ];
nativeBuildInputs = with pkgs; [ intltool ];
patches = [ ./patches/focusblur-glib.patch ]; patches = [ ./patches/focusblur-glib.patch ];
postInstall = "fail"; postInstall = "fail";
installPhase = "installPlugins src/focusblur"; installPhase = "installPlugins src/focusblur";
@ -130,10 +128,7 @@ rec {
*/ */
name = "resynthesizer-2.0.1"; name = "resynthesizer-2.0.1";
buildInputs = with pkgs; [ fftw ]; buildInputs = with pkgs; [ fftw ];
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [ autoreconfHook ];
autoreconfHook
intltool
];
makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/"; makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bootchk"; owner = "bootchk";
@ -150,7 +145,6 @@ rec {
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
}; };
buildInputs = with pkgs; [ perl ]; buildInputs = with pkgs; [ perl ];
nativeBuildInputs = with pkgs; [ intltool ];
patchPhase = '' patchPhase = ''
sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c* sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c*
''; '';
@ -162,7 +156,6 @@ rec {
Filters/Enhance/Wavelet sharpen Filters/Enhance/Wavelet sharpen
*/ */
name = "wavelet-sharpen-0.1.2"; name = "wavelet-sharpen-0.1.2";
nativeBuildInputs = with pkgs; [ intltool ];
src = fetchurl { src = fetchurl {
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@ -176,7 +169,6 @@ rec {
*/ */
name = "lqr-plugin-0.6.1"; name = "lqr-plugin-0.6.1";
buildInputs = with pkgs; [ libLQR ]; buildInputs = with pkgs; [ libLQR ];
nativeBuildInputs = with pkgs; [ intltool ];
src = fetchurl { src = fetchurl {
url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";