pyrox.dev / nixpkgs
lol
fork atom

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

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

https://github.com/jstedfast/gmime/blob/1137d672654a1e8fdbda52c7e02482c810d237af/configure.ac#L298-L322

Artturin e8d9eb71 e6b244b4

+35 -4
unified split
+7 -1
pkgs/development/libraries/gmime/2.nix
··· 13 13 14 14 nativeBuildInputs = [ pkg-config gobject-introspection ]; 15 15 propagatedBuildInputs = [ glib zlib libgpg-error ]; 16 - configureFlags = [ "--enable-introspection=yes" ]; 16 + configureFlags = [ 17 + "--enable-introspection=yes" 18 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; 17 19 18 20 postPatch = '' 19 21 substituteInPlace tests/testsuite.c \ ··· 22 24 23 25 substituteInPlace tests/test-pkcs7.c \ 24 26 --replace /bin/mkdir mkdir 27 + ''; 28 + 29 + preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' 30 + cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h 25 31 ''; 26 32 27 33 nativeCheckInputs = [ gnupg ];
+16 -3
pkgs/development/libraries/gmime/3.nix
··· 12 12 13 13 outputs = [ "out" "dev" ]; 14 14 15 - buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; 16 - nativeBuildInputs = [ pkg-config ]; 15 + nativeBuildInputs = [ pkg-config gobject-introspection vala ]; 16 + buildInputs = [ 17 + zlib 18 + gpgme 19 + libidn2 20 + libunistring 21 + vala # for share/vala/Makefile.vapigen 22 + ]; 17 23 propagatedBuildInputs = [ glib ]; 18 24 configureFlags = [ 19 25 "--enable-introspection=yes" 20 26 "--enable-vala=yes" 21 - ]; 27 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; 22 28 23 29 postPatch = '' 24 30 substituteInPlace tests/testsuite.c \ 25 31 --replace /bin/rm rm 32 + ''; 33 + 34 + preConfigure = '' 35 + PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" 36 + export PKG_CONFIG_VAPIGEN_VAPIGEN 37 + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' 38 + cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h 26 39 ''; 27 40 28 41 nativeCheckInputs = [ gnupg ];
+6
pkgs/development/libraries/gmime/iconv-detect.h
··· 1 + /* This is an auto-generated header, DO NOT EDIT! */ 2 + 3 + #define ICONV_ISO_INT_FORMAT "iso-%u-%u" 4 + #define ICONV_ISO_STR_FORMAT "iso-%u-%s" 5 + #define ICONV_SHIFT_JIS "shift-jis" 6 + #define ICONV_10646 "iso-10646"
+6
pkgs/development/libraries/gmime/musl-iconv-detect.h
··· 1 + /* This is an auto-generated header, DO NOT EDIT! */ 2 + 3 + #define ICONV_ISO_INT_FORMAT "iso-%u-%u" 4 + #define ICONV_ISO_STR_FORMAT "iso-%u-%s" 5 + #define ICONV_SHIFT_JIS "shift-jis" 6 + #define ICONV_10646 "UCS-4BE"