b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gmime2,gmime3: fix cross by copying iconv-detect.h from void-packages

Browse source 
https://github.com/void-linux/void-packages/tree/master/srcpkgs/gmime/files

1137d67265/configure.ac (L298-L322)
This commit is contained in:
Artturin 2023-03-26 00:45:29 +02:00
parent e6b244b41d
commit e8d9eb71f6
4 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/gmime/2.nix
View file

@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config gobject-introspection ];
propagatedBuildInputs = [ glib zlib libgpg-error ];
configureFlags = [ "--enable-introspection=yes" ];
configureFlags = [
"--enable-introspection=yes"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
postPatch = ''
substituteInPlace tests/testsuite.c \
@ -24,6 +26,10 @@ stdenv.mkDerivation rec {
--replace /bin/mkdir mkdir
'';
preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h
'';
nativeCheckInputs = [ gnupg ];
enableParallelBuilding = true;

19
pkgs/development/libraries/gmime/3.nix
View file

@ -12,19 +12,32 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config gobject-introspection vala ];
buildInputs = [
zlib
gpgme
libidn2
libunistring
vala # for share/vala/Makefile.vapigen
];
propagatedBuildInputs = [ glib ];
configureFlags = [
"--enable-introspection=yes"
"--enable-vala=yes"
];
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
postPatch = ''
substituteInPlace tests/testsuite.c \
--replace /bin/rm rm
'';
preConfigure = ''
PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"
export PKG_CONFIG_VAPIGEN_VAPIGEN
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h
'';
nativeCheckInputs = [ gnupg ];
doCheck = true;

6
pkgs/development/libraries/gmime/iconv-detect.h Normal file
View file

@ -0,0 +1,6 @@
/* This is an auto-generated header, DO NOT EDIT! */
#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
#define ICONV_SHIFT_JIS "shift-jis"
#define ICONV_10646 "iso-10646"

6
pkgs/development/libraries/gmime/musl-iconv-detect.h Normal file
View file

@ -0,0 +1,6 @@
/* This is an auto-generated header, DO NOT EDIT! */
#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
#define ICONV_SHIFT_JIS "shift-jis"
#define ICONV_10646 "UCS-4BE"