summary refs log tree commit diff
path: root/pkgs/applications/graphics/gimp
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-08-17 18:39:07 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-08-17 18:39:14 +0200
commit1e3f09feaa5667be4ed6eca96a984b4642420b83 (patch)
tree0581b5e9a5d0cb2821f7800a85c56ce9eb9d5e14 /pkgs/applications/graphics/gimp
parent8d9f9fda647464b2d645b314c705eaee506348b0 (diff)
downloadnixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.tar
nixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.tar.gz
nixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.tar.bz2
nixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.tar.lz
nixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.tar.xz
nixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.tar.zst
nixpkgs-1e3f09feaa5667be4ed6eca96a984b4642420b83.zip
gimp: reorder the expression
To use more standard layout.
Diffstat (limited to 'pkgs/applications/graphics/gimp')
-rw-r--r--pkgs/applications/graphics/gimp/default.nix30
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index aa440f2c47a..6ec15bf02ab 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -131,6 +131,21 @@ in stdenv.mkDerivation rec {
     gegl
   ];
 
+  configureFlags = [
+    "--without-webkit" # old version is required
+    "--disable-check-update"
+    "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
+    "--with-icc-directory=/run/current-system/sw/share/color/icc"
+    # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
+    "--libdir=\${exec_prefix}/lib"
+  ];
+
+  enableParallelBuilding = true;
+
+  # on Darwin,
+  # test-eevl.c:64:36: error: initializer element is not a compile-time constant
+  doCheck = !stdenv.isDarwin;
+
   # Check if librsvg was built with --disable-pixbuf-loader.
   PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
 
@@ -155,21 +170,6 @@ in stdenv.mkDerivation rec {
     gtk = gtk2;
   };
 
-  configureFlags = [
-    "--without-webkit" # old version is required
-    "--disable-check-update"
-    "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
-    "--with-icc-directory=/run/current-system/sw/share/color/icc"
-    # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
-    "--libdir=\${exec_prefix}/lib"
-  ];
-
-  # on Darwin,
-  # test-eevl.c:64:36: error: initializer element is not a compile-time constant
-  doCheck = !stdenv.isDarwin;
-
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "The GNU Image Manipulation Program";
     homepage = "https://www.gimp.org/";