gd: add withXorg flag, little cleanups

+13 -7
+13 -7
pkgs/development/libraries/gd/default.nix
··· 1 - { lib, stdenv, fetchurl 1 + { lib 2 + , stdenv 3 + , fetchurl 2 4 , fetchpatch 3 5 , autoconf 4 6 , automake ··· 8 10 , libjpeg 9 11 , libwebp 10 12 , libtiff 13 + , withXorg ? true 11 14 , libXpm 12 15 , libavif 13 16 , fontconfig ··· 33 36 34 37 hardeningDisable = [ "format" ]; 35 38 36 - configureFlags = 37 - [ 38 - "--enable-gd-formats" 39 - ] 39 + configureFlags = [ 40 + "--enable-gd-formats" 41 + ] 40 42 # -pthread gets passed to clang, causing warnings 41 43 ++ lib.optional stdenv.isDarwin "--enable-werror=no"; 42 44 43 45 nativeBuildInputs = [ autoconf automake pkg-config ]; 44 46 45 - buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libXpm libavif ]; 47 + buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ] 48 + ++ lib.optional withXorg libXpm; 46 49 47 50 outputs = [ "bin" "dev" "out" ]; 48 51 49 - postFixup = ''moveToOutput "bin/gdlib-config" $dev''; 52 + postFixup = '' 53 + moveToOutput "bin/gdlib-config" $dev 54 + ''; 50 55 51 56 enableParallelBuilding = true; 52 57 ··· 57 62 description = "A dynamic image creation library"; 58 63 license = licenses.free; # some custom license 59 64 platforms = platforms.unix; 65 + maintainers = with maintainers; [ ]; 60 66 }; 61 67 }