Unverified Commit 19e3800b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Fix build failures across Lomiri ecosystem (#426506)

parents 4f855d3f 17016c0c

pkgs/by-name/li/librda/1001-configure-GLib-gettext-is-deprecated-use-regular-get.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
From 08208a1193d10903bd291c4993bdcd4203c20780 Mon Sep 17 00:00:00 2001

From: OPNA2608 <opna2608@protonmail.com>

Date: Wed, 16 Jul 2025 20:34:38 +0200

Subject: [PATCH] configure: GLib gettext is deprecated, use regular gettext



---

 configure.ac | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/configure.ac b/configure.ac

index 0a50ed8..8e30d7b 100644

--- a/configure.ac

+++ b/configure.ac

@@ -90,7 +90,8 @@ GETTEXT_PACKAGE=librda

 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",

 		   [The gettext translation domain])

 AC_SUBST(GETTEXT_PACKAGE)

-AM_GLIB_GNU_GETTEXT

+AM_GNU_GETTEXT([external])

+AM_GNU_GETTEXT_VERSION([0.21])

 

 AC_CONFIG_FILES([

 Makefile

-- 

2.49.0

pkgs/by-name/li/librda/package.nix

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ stdenv.mkDerivation (finalAttrs: { 
    "bin"

  ];



  patches = [

    # Use proper gettext instead of GLib macros

    # Remove when https://github.com/ArcticaProject/librda/pull/10 merged & in release

    ./1001-configure-GLib-gettext-is-deprecated-use-regular-get.patch

  ];



  strictDeps = true;



  nativeBuildInputs = [

pkgs/by-name/pe/persistent-cache-cpp/package.nix

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ stdenv.mkDerivation (finalAttrs: { 


  postPatch =

    ''

      # GTest needs C++17

      # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/19 merged & in release

      substituteInPlace CMakeLists.txt \

        --replace-fail 'std=c++14' 'std=c++17'



      # Wrong concatenation

      substituteInPlace data/libpersistent-cache-cpp.pc.in \

        --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib"

pkgs/by-name/pr/properties-cpp/package.nix

+10 −3
Original line number Diff line number Diff line
@@ -23,7 +23,14 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q=";

  };



  postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) ''

  postPatch =

    ''

      # GTest needs C++17

      # Remove when https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp/-/merge_requests/3 merged & in release

      substituteInPlace CMakeLists.txt \

        --replace-fail 'std=c++14' 'std=c++17'

    ''

    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''

      sed -i "/add_subdirectory(tests)/d" CMakeLists.txt

    '';

pkgs/desktops/lomiri/development/gmenuharness/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ stdenv.mkDerivation (finalAttrs: { 
    })

  ];



  postPatch = ''

    # GTest needs C++17

    # Remove when https://gitlab.com/ubports/development/core/gmenuharness/-/merge_requests/5 merged & in release

    substituteInPlace CMakeLists.txt \

      --replace-fail 'std=c++14' 'std=c++17'

  '';



  strictDeps = true;



  nativeBuildInputs = [