libgdiplus: 6.0.5 -> 6.1
This commit is contained in:
parent
ba0f52d803
commit
9adb210298
|
@ -0,0 +1,17 @@
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index e47a3f1..f529e69 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -16,10 +16,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
|
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||||
|
-if test "x$PKG_CONFIG" = "xno"; then
|
||||||
|
- AC_MSG_ERROR([You need to install pkg-config])
|
||||||
|
-fi
|
||||||
|
+PKG_PROG_PKG_CONFIG
|
||||||
|
+
|
||||||
|
GLIB_REQUIRED_VERSION="2.2.3"
|
||||||
|
PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
|
||||||
|
|
|
@ -1,18 +1,23 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig
|
{ lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig
|
||||||
, libtiff, giflib, libjpeg, libpng
|
, libtiff, giflib, libjpeg, libpng
|
||||||
, libXrender, libexif, autoreconfHook, fetchpatch }:
|
, libXrender, libexif, autoreconfHook, fetchpatch }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libgdiplus";
|
pname = "libgdiplus";
|
||||||
version = "6.0.5";
|
version = "6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
# Using source archive to avoid fetching Git submodules.
|
||||||
owner = "mono";
|
# Git repo: https://github.com/mono/libgdiplus
|
||||||
repo = "libgdiplus";
|
src = fetchzip {
|
||||||
rev = version;
|
url = "https://download.mono-project.com/sources/libgdiplus/libgdiplus-${finalAttrs.version}.tar.gz";
|
||||||
sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c";
|
hash = "sha256-+lP9ETlw3s0RUliQT1uBWZ2j6o3V9EECBQSppOYFq4Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix pkg-config lookup when cross-compiling.
|
||||||
|
./configure-pkg-config.patch
|
||||||
|
];
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lgif";
|
NIX_LDFLAGS = "-lgif";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
@ -45,4 +50,4 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
Loading…
Reference in a new issue