gd: add withXorg flag, little cleanups

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