Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f3f38eccbb06
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c149ee84d1d
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on May 1, 2017

  1. gimp: fix all plugins build

    @avnik
    avnik committed May 1, 2017
    Copy the full SHA
    94d909a View commit details

Commits on May 2, 2017

  1. gimp: split buildInputs and nativeBuildInputs for plugins

    @avnik
    avnik committed May 2, 2017
    Copy the full SHA
    8452e06 View commit details

Commits on May 4, 2017

  1. gimp: promote intltool to default nativeBuildDepends 

    It used by gimp itself (so should be already present on machine builds
gimp+plugins) and 90% of plugins.
    @avnik
    avnik committed May 4, 2017
    Copy the full SHA
    db82435 View commit details

  2. Merge pull request #25393 from avnik/fix/gimp 

    gimp: fix all plugins build
    @7c6f434c
    7c6f434c authored May 4, 2017
    Copy the full SHA
    6c149ee View commit details
Showing with 16 additions and 18 deletions.
  1. +16 −18 pkgs/applications/graphics/gimp/plugins/default.nix
34 changes: 16 additions & 18 deletions pkgs/applications/graphics/gimp/plugins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

{ pkgs, gimp }:
let
inherit (pkgs) stdenv fetchurl pkgconfig glib fetchFromGitHub;
inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub;
inherit (gimp) targetPluginDir targetScriptDir;

pluginDerivation = a: stdenv.mkDerivation ({
@@ -23,7 +23,11 @@ let
}
// a
# don't call this gimp-* unless you want nix replace gimp by a plugin :-)
// { name = "${a.name}-${gimp.name}-plugin"; }
// {
name = "${a.name}-${gimp.name}-plugin";
buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
}
);

scriptDerivation = {name, src} : pluginDerivation {
@@ -34,7 +38,6 @@ let
libLQR = pluginDerivation {
name = "liblqr-1-0.4.1";
# required by lqrPlugin, you don't havet to install this lib explicitely
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
@@ -48,7 +51,6 @@ rec {
Video
*/
name = "gap-2.6.0";
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@@ -73,7 +75,7 @@ rec {
Filters/Generic/FFT Inverse
*/
name = "fourier-0.4.1";
buildInputs = [ gimp pkgs.fftw pkgconfig glib] ++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ fftw ];
postInstall = "fail";
installPhase = "installPlugins fourier";
src = fetchurl {
@@ -87,7 +89,7 @@ rec {
Blur/Focus Blur
*/
name = "focusblur-3.2.6";
buildInputs = [ gimp pkgconfig pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ fftwSinglePrec ];
patches = [ ./patches/focusblur-glib.patch ];
postInstall = "fail";
installPhase = "installPlugins src/focusblur";
@@ -105,7 +107,7 @@ rec {
Filters/Enhance/Smart remove selection
*/
name = "resynthesizer-0.16";
buildInputs = [ gimp pkgs.fftw pkgs.pkgconfig pkgs.gtk2 ] ++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ fftw ];
src = fetchurl {
url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
@@ -125,10 +127,8 @@ rec {
Filters/Enhance/Smart remove selection
*/
name = "resynthesizer-2.0.1";
buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook pkgs.pkgconfig pkgs.gtk2
pkgs.intltool
]
++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ fftw ];
nativeBuildInputs = with pkgs; [ autoreconfHook ];
makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
src = fetchFromGitHub {
owner = "bootchk";
@@ -140,11 +140,11 @@ rec {

texturize = pluginDerivation {
name = "texturize-2.1";
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz;
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
};
buildInputs = with pkgs; [ perl ];
patchPhase = ''
sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c*
'';
@@ -156,7 +156,6 @@ rec {
Filters/Enhance/Wavelet sharpen
*/
name = "wavelet-sharpen-0.1.2";
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
@@ -169,7 +168,7 @@ rec {
Layer/Liquid Rescale
*/
name = "lqr-plugin-0.6.1";
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ libLQR ];
src = fetchurl {
url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
@@ -182,8 +181,7 @@ rec {
pluginDerivation rec {
inherit (pkgs.gmic) name src meta;

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ fftw opencv curl ];

sourceRoot = "${name}/src";

@@ -197,7 +195,7 @@ rec {
# or use the binary
ufraw = pluginDerivation rec {
name = "ufraw-0.19.2";
buildInputs = [pkgs.gtkimageview pkgs.lcms gimp] ++ gimp.nativeBuildInputs;
buildInputs = with pkgs; [ gtkimageview lcms ];
# --enable-mime - install mime files, see README for more information
# --enable-extras - build extra (dcraw, nikon-curve) executables
# --enable-dst-correction - enable DST correction for file timestamps.
@@ -230,7 +228,7 @@ rec {
sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz";
};

buildInputs = [ gimp pkgconfig glib gimp.gtk pkgs.lensfun pkgs.exiv2 ];
buildInputs = with pkgs; [ lensfun exiv2 ];

installPhase = "
installPlugins gimp-lensfun