Unverified Commit 01dd3635 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #225103 from uninsane/pr/sane/cross-2023-04-06

parents aff526b4 a08a67a5

pkgs/applications/misc/fuzzel/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ stdenv.mkDerivation rec { 
    hash = "sha256-Va/Rm35jqxDlIfQdrpZ41qrW8YzWmm1LWra76AW1xUw=";

  };



  depsBuildBuild = [

    pkg-config

  ];



  nativeBuildInputs = [

    pkg-config

    wayland-scanner

pkgs/development/libraries/libHX/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec { 


  patches = [];



  nativeBuildInputs = [ autoconf automake ];

  buildInputs = [ libtool ];

  nativeBuildInputs = [ autoconf automake libtool ];



  preConfigure = ''

    sh autogen.sh

pkgs/development/libraries/libchamplain/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec { 
  pname = "libchamplain";

  version = "0.12.21";



  outputs = [ "out" "dev" "devdoc" ];

  outputs = [ "out" "dev" ]

    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ];



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec { 
    pkg-config

    gobject-introspection

    vala

  ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [

    gtk-doc

    docbook_xsl

    docbook_xml_dtd_412
@@ -55,7 +57,7 @@ stdenv.mkDerivation rec { 
  ];



  mesonFlags = [

    "-Dgtk_doc=true"

    (lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform))

    "-Dvapi=true"

    (lib.mesonBool "libsoup3" withLibsoup3)

  ];

pkgs/development/libraries/libjcat/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec { 
    docbook-xsl-nons

    gobject-introspection

    vala

    gnutls

    gtk-doc

    python3

  ];

pkgs/development/libraries/librest/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    pkg-config

    gobject-introspection

  ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [

    gtk-doc

    docbook-xsl-nons

    docbook_xml_dtd_412
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec { 
  ];



  configureFlags = [

    "--enable-gtk-doc"

    (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "gtk-doc")

    # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged.

    "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"

  ];