lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

libgdiplus: 6.0.5 -> 6.1

+31 -9
+17
pkgs/development/libraries/libgdiplus/configure-pkg-config.patch
··· 1 + diff --git a/configure.ac b/configure.ac 2 + index e47a3f1..f529e69 100644 3 + --- a/configure.ac 4 + +++ b/configure.ac 5 + @@ -16,10 +16,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 6 + 7 + AC_C_BIGENDIAN 8 + 9 + -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 10 + -if test "x$PKG_CONFIG" = "xno"; then 11 + - AC_MSG_ERROR([You need to install pkg-config]) 12 + -fi 13 + +PKG_PROG_PKG_CONFIG 14 + + 15 + GLIB_REQUIRED_VERSION="2.2.3" 16 + PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) 17 +
+14 -9
pkgs/development/libraries/libgdiplus/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig 1 + { lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig 2 2 , libtiff, giflib, libjpeg, libpng 3 3 , libXrender, libexif, autoreconfHook, fetchpatch }: 4 4 5 - stdenv.mkDerivation rec { 5 + stdenv.mkDerivation (finalAttrs: { 6 6 pname = "libgdiplus"; 7 - version = "6.0.5"; 7 + version = "6.1"; 8 8 9 - src = fetchFromGitHub { 10 - owner = "mono"; 11 - repo = "libgdiplus"; 12 - rev = version; 13 - sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c"; 9 + # Using source archive to avoid fetching Git submodules. 10 + # Git repo: https://github.com/mono/libgdiplus 11 + src = fetchzip { 12 + url = "https://download.mono-project.com/sources/libgdiplus/libgdiplus-${finalAttrs.version}.tar.gz"; 13 + hash = "sha256-+lP9ETlw3s0RUliQT1uBWZ2j6o3V9EECBQSppOYFq4Q="; 14 14 }; 15 + 16 + patches = [ 17 + # Fix pkg-config lookup when cross-compiling. 18 + ./configure-pkg-config.patch 19 + ]; 15 20 16 21 NIX_LDFLAGS = "-lgif"; 17 22 ··· 45 50 platforms = platforms.unix; 46 51 license = licenses.mit; 47 52 }; 48 - } 53 + })