Unverified Commit 06c63bcc authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #223142 from Artturin/crossfixes6

parents b740337f 7b3e5b00

pkgs/desktops/gnome/core/gucharmap/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, intltool

, fetchFromGitLab

, meson

, mesonEmulatorHook

, ninja

, pkg-config

, python3
@@ -18,7 +19,6 @@ 
, docbook_xsl

, docbook_xml_dtd_412

, gsettings-desktop-schemas

, callPackage

, unzip

, unicode-character-database

, unihan-database
@@ -57,6 +57,7 @@ in stdenv.mkDerivation rec { 
    sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo=";

  };



  strictDeps = true;

  nativeBuildInputs = [

    meson

    ninja
@@ -73,6 +74,8 @@ in stdenv.mkDerivation rec { 
    libxml2

    desktop-file-utils

    gobject-introspection

  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

    mesonEmulatorHook

  ];



  buildInputs = [

pkgs/development/libraries/amtk/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, fetchurl

, gtk3

, meson

, mesonEmulatorHook

, ninja

, pkg-config

, gobject-introspection
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec { 
    sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig=";

  };



  strictDeps = true;

  nativeBuildInputs = [

    meson

    ninja
@@ -32,6 +34,8 @@ stdenv.mkDerivation rec { 
    gobject-introspection

    gtk-doc

    docbook-xsl-nons

  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

    mesonEmulatorHook

  ];



  buildInputs = [

pkgs/development/libraries/clutter-gst/default.nix

+3 −2
Original line number Diff line number Diff line 
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }:

{ fetchurl, fetchpatch, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf, gobject-introspection }:



stdenv.mkDerivation rec {

  pname = "clutter-gst";
@@ -21,8 +21,9 @@ stdenv.mkDerivation rec { 
    })

  ];



  strictDeps = true;

  nativeBuildInputs = [ pkg-config glib gobject-introspection ];

  propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ];

  nativeBuildInputs = [ pkg-config ];



  postBuild = "rm -rf $out/share/gtk-doc";

pkgs/development/libraries/gmime/2.nix

+7 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/development/libraries/gmime/3.nix

+16 −3
Original line number Diff line number Diff line
@@ -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;