Skip to content
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.

Sign up for GitHub

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

gd: add withXorg flag, little cleanups #204426

Merged
merged 1 commit into from
Dec 10, 2022
Merged

gd: add withXorg flag, little cleanups #204426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions pkgs/development/libraries/gd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ lib, stdenv, fetchurl
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoconf
, automake
Expand All @@ -8,6 +10,7 @@
, libjpeg
, libwebp
, libtiff
, withXorg ? true
, libXpm
, libavif
, fontconfig
Expand All @@ -33,20 +36,22 @@ stdenv.mkDerivation rec {

hardeningDisable = [ "format" ];

configureFlags =
[
"--enable-gd-formats"
]
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 ];
buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ]
++ lib.optional withXorg libXpm;

outputs = [ "bin" "dev" "out" ];

postFixup = ''moveToOutput "bin/gdlib-config" $dev'';
postFixup = ''
moveToOutput "bin/gdlib-config" $dev
'';

enableParallelBuilding = true;

Expand All @@ -57,5 +62,6 @@ stdenv.mkDerivation rec {
description = "A dynamic image creation library";
license = licenses.free; # some custom license
platforms = platforms.unix;
maintainers = with maintainers; [ ];
};
}