Merge pull request #223142 from Artturin/crossfixes6

authored by Artturi and committed by GitHub 06c63bcc b740337f

+78 -10
+4 -1
pkgs/desktops/gnome/core/gucharmap/default.nix
··· 3 , intltool 4 , fetchFromGitLab 5 , meson 6 , ninja 7 , pkg-config 8 , python3 ··· 18 , docbook_xsl 19 , docbook_xml_dtd_412 20 , gsettings-desktop-schemas 21 - , callPackage 22 , unzip 23 , unicode-character-database 24 , unihan-database ··· 57 sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo="; 58 }; 59 60 nativeBuildInputs = [ 61 meson 62 ninja ··· 73 libxml2 74 desktop-file-utils 75 gobject-introspection 76 ]; 77 78 buildInputs = [
··· 3 , intltool 4 , fetchFromGitLab 5 , meson 6 + , mesonEmulatorHook 7 , ninja 8 , pkg-config 9 , python3 ··· 19 , docbook_xsl 20 , docbook_xml_dtd_412 21 , gsettings-desktop-schemas 22 , unzip 23 , unicode-character-database 24 , unihan-database ··· 57 sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo="; 58 }; 59 60 + strictDeps = true; 61 nativeBuildInputs = [ 62 meson 63 ninja ··· 74 libxml2 75 desktop-file-utils 76 gobject-introspection 77 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 78 + mesonEmulatorHook 79 ]; 80 81 buildInputs = [
+4
pkgs/development/libraries/amtk/default.nix
··· 3 , fetchurl 4 , gtk3 5 , meson 6 , ninja 7 , pkg-config 8 , gobject-introspection ··· 24 sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; 25 }; 26 27 nativeBuildInputs = [ 28 meson 29 ninja ··· 32 gobject-introspection 33 gtk-doc 34 docbook-xsl-nons 35 ]; 36 37 buildInputs = [
··· 3 , fetchurl 4 , gtk3 5 , meson 6 + , mesonEmulatorHook 7 , ninja 8 , pkg-config 9 , gobject-introspection ··· 25 sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; 26 }; 27 28 + strictDeps = true; 29 nativeBuildInputs = [ 30 meson 31 ninja ··· 34 gobject-introspection 35 gtk-doc 36 docbook-xsl-nons 37 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 38 + mesonEmulatorHook 39 ]; 40 41 buildInputs = [
+3 -2
pkgs/development/libraries/clutter-gst/default.nix
··· 1 - { fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: 2 3 stdenv.mkDerivation rec { 4 pname = "clutter-gst"; ··· 21 }) 22 ]; 23 24 propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; 25 - nativeBuildInputs = [ pkg-config ]; 26 27 postBuild = "rm -rf $out/share/gtk-doc"; 28
··· 1 + { fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf, gobject-introspection }: 2 3 stdenv.mkDerivation rec { 4 pname = "clutter-gst"; ··· 21 }) 22 ]; 23 24 + strictDeps = true; 25 + nativeBuildInputs = [ pkg-config glib gobject-introspection ]; 26 propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; 27 28 postBuild = "rm -rf $out/share/gtk-doc"; 29
+7 -1
pkgs/development/libraries/gmime/2.nix
··· 13 14 nativeBuildInputs = [ pkg-config gobject-introspection ]; 15 propagatedBuildInputs = [ glib zlib libgpg-error ]; 16 - configureFlags = [ "--enable-introspection=yes" ]; 17 18 postPatch = '' 19 substituteInPlace tests/testsuite.c \ ··· 22 23 substituteInPlace tests/test-pkcs7.c \ 24 --replace /bin/mkdir mkdir 25 ''; 26 27 nativeCheckInputs = [ gnupg ];
··· 13 14 nativeBuildInputs = [ pkg-config gobject-introspection ]; 15 propagatedBuildInputs = [ glib zlib libgpg-error ]; 16 + configureFlags = [ 17 + "--enable-introspection=yes" 18 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; 19 20 postPatch = '' 21 substituteInPlace tests/testsuite.c \ ··· 24 25 substituteInPlace tests/test-pkcs7.c \ 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 31 ''; 32 33 nativeCheckInputs = [ gnupg ];
+16 -3
pkgs/development/libraries/gmime/3.nix
··· 12 13 outputs = [ "out" "dev" ]; 14 15 - buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; 16 - nativeBuildInputs = [ pkg-config ]; 17 propagatedBuildInputs = [ glib ]; 18 configureFlags = [ 19 "--enable-introspection=yes" 20 "--enable-vala=yes" 21 - ]; 22 23 postPatch = '' 24 substituteInPlace tests/testsuite.c \ 25 --replace /bin/rm rm 26 ''; 27 28 nativeCheckInputs = [ gnupg ];
··· 12 13 outputs = [ "out" "dev" ]; 14 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 + ]; 23 propagatedBuildInputs = [ glib ]; 24 configureFlags = [ 25 "--enable-introspection=yes" 26 "--enable-vala=yes" 27 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; 28 29 postPatch = '' 30 substituteInPlace tests/testsuite.c \ 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 39 ''; 40 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"
+1
pkgs/development/libraries/gtksourceview/5.x.nix
··· 59 gobject-introspection 60 vala 61 gi-docgen 62 ]; 63 64 buildInputs = [
··· 59 gobject-introspection 60 vala 61 gi-docgen 62 + gtk4 # for gtk4-update-icon-cache checked during configure 63 ]; 64 65 buildInputs = [
+13 -2
pkgs/development/libraries/libcloudproviders/default.nix
··· 1 - { lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: 2 3 # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed 4 ··· 17 "-Denable-gtk-doc=true" 18 ]; 19 20 - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ]; 21 22 buildInputs = [ glib ]; 23
··· 1 + { lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib, mesonEmulatorHook }: 2 3 # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed 4 ··· 17 "-Denable-gtk-doc=true" 18 ]; 19 20 + strictDeps = true; 21 + nativeBuildInputs = [ 22 + meson 23 + ninja 24 + pkg-config 25 + gobject-introspection 26 + vala 27 + gtk-doc 28 + docbook_xsl 29 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 30 + mesonEmulatorHook 31 + ]; 32 33 buildInputs = [ glib ]; 34
+8
pkgs/development/libraries/librest/1.0.nix
··· 37 }) 38 ]; 39 40 nativeBuildInputs = [ 41 meson 42 ninja ··· 64 # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19 65 substituteInPlace meson.build \ 66 --replace "con." "conf." 67 ''; 68 69 postFixup = ''
··· 37 }) 38 ]; 39 40 + strictDeps = true; 41 + depsBuildBuild = [ pkg-config ]; 42 nativeBuildInputs = [ 43 meson 44 ninja ··· 66 # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19 67 substituteInPlace meson.build \ 68 --replace "con." "conf." 69 + 70 + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) 71 + # it should be a build-time dep for build 72 + # TODO: send upstream 73 + substituteInPlace docs/meson.build \ 74 + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" 75 ''; 76 77 postFixup = ''
+2 -1
pkgs/development/libraries/telepathy/glib/default.nix
··· 22 sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; 23 }; 24 25 nativeBuildInputs = [ 26 pkg-config 27 libxslt 28 gobject-introspection 29 vala 30 ]; 31 32 buildInputs = [ 33 glibcLocales 34 - python3 35 ]; 36 37 propagatedBuildInputs = [
··· 22 sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; 23 }; 24 25 + strictDeps = true; 26 nativeBuildInputs = [ 27 pkg-config 28 libxslt 29 gobject-introspection 30 vala 31 + python3 32 ]; 33 34 buildInputs = [ 35 glibcLocales 36 ]; 37 38 propagatedBuildInputs = [
+4
pkgs/development/libraries/tepl/default.nix
··· 1 { lib, stdenv 2 , fetchurl 3 , meson 4 , ninja 5 , amtk 6 , gnome ··· 24 sha256 = "XlayBmnQzwX6HWS1jIw0LFkVgSLcUYEA0JPVnfm4cyE="; 25 }; 26 27 nativeBuildInputs = [ 28 meson 29 ninja ··· 31 pkg-config 32 gtk-doc 33 docbook-xsl-nons 34 ]; 35 36 buildInputs = [
··· 1 { lib, stdenv 2 , fetchurl 3 , meson 4 + , mesonEmulatorHook 5 , ninja 6 , amtk 7 , gnome ··· 25 sha256 = "XlayBmnQzwX6HWS1jIw0LFkVgSLcUYEA0JPVnfm4cyE="; 26 }; 27 28 + strictDeps = true; 29 nativeBuildInputs = [ 30 meson 31 ninja ··· 33 pkg-config 34 gtk-doc 35 docbook-xsl-nons 36 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 37 + mesonEmulatorHook 38 ]; 39 40 buildInputs = [
+4
pkgs/development/libraries/uhttpmock/default.nix
··· 2 , lib 3 , fetchFromGitLab 4 , meson 5 , ninja 6 , pkg-config 7 , gobject-introspection ··· 26 sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; 27 }; 28 29 nativeBuildInputs = [ 30 meson 31 ninja ··· 34 vala 35 gtk-doc 36 docbook-xsl-nons 37 ]; 38 39 buildInputs = [
··· 2 , lib 3 , fetchFromGitLab 4 , meson 5 + , mesonEmulatorHook 6 , ninja 7 , pkg-config 8 , gobject-introspection ··· 27 sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; 28 }; 29 30 + strictDeps = true; 31 nativeBuildInputs = [ 32 meson 33 ninja ··· 36 vala 37 gtk-doc 38 docbook-xsl-nons 39 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 40 + mesonEmulatorHook 41 ]; 42 43 buildInputs = [