pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #223142 from Artturin/crossfixes6

authored by Artturi and committed by GitHub 06c63bcc b740337f

+78 -10
unified split
+4 -1
pkgs/desktops/gnome/core/gucharmap/default.nix
··· 3 3 , intltool 4 4 , fetchFromGitLab 5 5 , meson 6 + , mesonEmulatorHook 6 7 , ninja 7 8 , pkg-config 8 9 , python3 ··· 18 19 , docbook_xsl 19 20 , docbook_xml_dtd_412 20 21 , gsettings-desktop-schemas 21 - , callPackage 22 22 , unzip 23 23 , unicode-character-database 24 24 , unihan-database ··· 57 57 sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo="; 58 58 }; 59 59 60 + strictDeps = true; 60 61 nativeBuildInputs = [ 61 62 meson 62 63 ninja ··· 73 74 libxml2 74 75 desktop-file-utils 75 76 gobject-introspection 77 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 78 + mesonEmulatorHook 76 79 ]; 77 80 78 81 buildInputs = [
+4
pkgs/development/libraries/amtk/default.nix
··· 3 3 , fetchurl 4 4 , gtk3 5 5 , meson 6 + , mesonEmulatorHook 6 7 , ninja 7 8 , pkg-config 8 9 , gobject-introspection ··· 24 25 sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; 25 26 }; 26 27 28 + strictDeps = true; 27 29 nativeBuildInputs = [ 28 30 meson 29 31 ninja ··· 32 34 gobject-introspection 33 35 gtk-doc 34 36 docbook-xsl-nons 37 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 38 + mesonEmulatorHook 35 39 ]; 36 40 37 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 }: 1 + { fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf, gobject-introspection }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "clutter-gst"; ··· 21 21 }) 22 22 ]; 23 23 24 + strictDeps = true; 25 + nativeBuildInputs = [ pkg-config glib gobject-introspection ]; 24 26 propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ]; 25 - nativeBuildInputs = [ pkg-config ]; 26 27 27 28 postBuild = "rm -rf $out/share/gtk-doc"; 28 29
+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"
+1
pkgs/development/libraries/gtksourceview/5.x.nix
··· 59 59 gobject-introspection 60 60 vala 61 61 gi-docgen 62 + gtk4 # for gtk4-update-icon-cache checked during configure 62 63 ]; 63 64 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 }: 1 + { lib, stdenv, fetchurl, meson, ninja, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, glib, mesonEmulatorHook }: 2 2 3 3 # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed 4 4 ··· 17 17 "-Denable-gtk-doc=true" 18 18 ]; 19 19 20 - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl ]; 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 + ]; 21 32 22 33 buildInputs = [ glib ]; 23 34
+8
pkgs/development/libraries/librest/1.0.nix
··· 37 37 }) 38 38 ]; 39 39 40 + strictDeps = true; 41 + depsBuildBuild = [ pkg-config ]; 40 42 nativeBuildInputs = [ 41 43 meson 42 44 ninja ··· 64 66 # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19 65 67 substituteInPlace meson.build \ 66 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" 67 75 ''; 68 76 69 77 postFixup = ''
+2 -1
pkgs/development/libraries/telepathy/glib/default.nix
··· 22 22 sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; 23 23 }; 24 24 25 + strictDeps = true; 25 26 nativeBuildInputs = [ 26 27 pkg-config 27 28 libxslt 28 29 gobject-introspection 29 30 vala 31 + python3 30 32 ]; 31 33 32 34 buildInputs = [ 33 35 glibcLocales 34 - python3 35 36 ]; 36 37 37 38 propagatedBuildInputs = [
+4
pkgs/development/libraries/tepl/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchurl 3 3 , meson 4 + , mesonEmulatorHook 4 5 , ninja 5 6 , amtk 6 7 , gnome ··· 24 25 sha256 = "XlayBmnQzwX6HWS1jIw0LFkVgSLcUYEA0JPVnfm4cyE="; 25 26 }; 26 27 28 + strictDeps = true; 27 29 nativeBuildInputs = [ 28 30 meson 29 31 ninja ··· 31 33 pkg-config 32 34 gtk-doc 33 35 docbook-xsl-nons 36 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 37 + mesonEmulatorHook 34 38 ]; 35 39 36 40 buildInputs = [
+4
pkgs/development/libraries/uhttpmock/default.nix
··· 2 2 , lib 3 3 , fetchFromGitLab 4 4 , meson 5 + , mesonEmulatorHook 5 6 , ninja 6 7 , pkg-config 7 8 , gobject-introspection ··· 26 27 sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; 27 28 }; 28 29 30 + strictDeps = true; 29 31 nativeBuildInputs = [ 30 32 meson 31 33 ninja ··· 34 36 vala 35 37 gtk-doc 36 38 docbook-xsl-nons 39 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 40 + mesonEmulatorHook 37 41 ]; 38 42 39 43 buildInputs = [