Enable cross compiling of network manager plugin

prinzdezibel · Dec 9, 2024 · 971d7ef · 971d7ef
1 parent 36f25b0
commit 971d7ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     gettext
     pkg-config
     file
+    glib
   ];
 
   buildInputs = [

diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation {
       libnma
     ];
 
+  # configure.ac:53: warning: macro 'AM_GLIB_GNU_GETTEXT' not found in library
+  strictDeps = false;
+
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager

diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix
@@ -6,6 +6,7 @@
 , openssl
 , ppp
 , systemd
+, glib
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 , withPpp ? stdenv.hostPlatform.isLinux
 }:
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
       --replace '$(DESTDIR)$(confdir)' /tmp
   '';
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  nativeBuildInputs = [ autoreconfHook pkg-config glib ];
 
   buildInputs = [
     openssl
@@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ]
   ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-  ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd";
+  ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd"
+  ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-proc";
 
   enableParallelBuilding = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { @@
         gettext
         pkg-config
         file
+        glib
       ];
       buildInputs = [
@@ Expand Down @@