Merge pull request #204426 from SuperSandro2000/gd-nox

gd: add withXorg flag, little cleanups

Artturi d17577b9 54cd3a35

Changed files
+13 -7
pkgs
development
libraries
+13 -7
pkgs/development/libraries/gd/default.nix
···
-
{ lib, stdenv, fetchurl
, fetchpatch
, autoconf
, automake
···
, libjpeg
, libwebp
, libtiff
, libXpm
, libavif
, fontconfig
···
hardeningDisable = [ "format" ];
-
configureFlags =
-
[
-
"--enable-gd-formats"
-
]
# -pthread gets passed to clang, causing warnings
++ lib.optional stdenv.isDarwin "--enable-werror=no";
nativeBuildInputs = [ autoconf automake pkg-config ];
-
buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libXpm libavif ];
outputs = [ "bin" "dev" "out" ];
-
postFixup = ''moveToOutput "bin/gdlib-config" $dev'';
enableParallelBuilding = true;
···
description = "A dynamic image creation library";
license = licenses.free; # some custom license
platforms = platforms.unix;
};
}
···
+
{ lib
+
, stdenv
+
, fetchurl
, fetchpatch
, autoconf
, automake
···
, libjpeg
, libwebp
, libtiff
+
, withXorg ? true
, libXpm
, libavif
, fontconfig
···
hardeningDisable = [ "format" ];
+
configureFlags = [
+
"--enable-gd-formats"
+
]
# -pthread gets passed to clang, causing warnings
++ lib.optional stdenv.isDarwin "--enable-werror=no";
nativeBuildInputs = [ autoconf automake pkg-config ];
+
buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ]
+
++ lib.optional withXorg libXpm;
outputs = [ "bin" "dev" "out" ];
+
postFixup = ''
+
moveToOutput "bin/gdlib-config" $dev
+
'';
enableParallelBuilding = true;
···
description = "A dynamic image creation library";
license = licenses.free; # some custom license
platforms = platforms.unix;
+
maintainers = with maintainers; [ ];
};
}