Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Librem5 phone apps #57614

Closed
wants to merge 3 commits into from
Closed

Librem5 phone apps #57614

wants to merge 3 commits into from

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Mar 14, 2019 •
edited

Motivation for this change

Another mostly useless draft I am posting because it might be interesting for someone.

Other interesting software:

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 14, 2019 •
edited

Looks like we need ell for ofono.

@jtojnar jtojnar mentioned this pull request Mar 14, 2019
Open
22 tasks
@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 24, 2019

I added ell but it does not see dbus for some unknown reason – even though the patch bellow does print the flags:

PKG_CONFIG_PATH=/nix/store/7305ma71607da71zk4qaz0jgd8mim657-dbus-1.12.12-dev/lib/pkgconfig:/nix/store/cfjdwacdkkmq1djxn5jv3nv2gdjxzaz9-expat-2.2.6-dev/lib/pkgconfig:/nix/store/7305ma71607da71zk4qaz0jgd8mim657-dbus-1.12.12-dev/lib/pkgconfig:/nix/store/cfjdwacdkkmq1djxn5jv3nv2gdjxzaz9-expat-2.2.6-dev/lib/pkgconfig
[...]
-L/nix/store/h4qg4vb2lx699pv5csy2wp2g0vkhiycr-dbus-1.12.12-lib/lib -ldbus-1

diff --git a/pkgs/development/libraries/ell/default.nix b/pkgs/development/libraries/ell/default.nix
index ace9be2ac96..70a445a5f8b 100644
--- a/pkgs/development/libraries/ell/default.nix
+++ b/pkgs/development/libraries/ell/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
      sha256 = "0yk1qmvpy61qp82bb0w55n062jqzlkzbz0b1v5k763j98czz9rvz";
   };
 
+  preConfigure = ''
+    env
+    pkg-config --libs dbus-1
+    '';
+
   patches = [
     ./fix-dbus-tests.patch
   ];
diff --git a/pkgs/development/libraries/ell/fix-dbus-tests.patch b/pkgs/development/libraries/ell/fix-dbus-tests.patch
index 483114629ae..4e5effba511 100644
--- a/pkgs/development/libraries/ell/fix-dbus-tests.patch
+++ b/pkgs/development/libraries/ell/fix-dbus-tests.patch
@@ -10,10 +10,12 @@
  pkgconfigdir = $(libdir)/pkgconfig
 --- a/configure.ac
 +++ b/configure.ac
-@@ -129,6 +129,10 @@
+@@ -129,6 +129,12 @@
  	AC_CHECK_PROG(have_xxd, [xxd], [yes], [no])
  fi
  
++PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes,
++			AC_MSG_ERROR(D-Bus is required for running tests))
 +PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir, dummy=yes,
 +			AC_MSG_ERROR(D-Bus is required for running tests))
 +

@jtojnar
Copy link
Contributor Author

jtojnar commented Mar 25, 2019 •
edited

Fixed the Ell build with a hack but now ofono fails on a linking issue:

/nix/store/2dfjlvp38xzkyylwpavnh61azi0d168b-binutils-2.31.1/bin/ld: src/main.o: in function `main':
main.c:(.text.startup+0x109): undefined reference to `__stop___ell_debug'
/nix/store/2dfjlvp38xzkyylwpavnh61azi0d168b-binutils-2.31.1/bin/ld: main.c:(.text.startup+0x110): undefined reference to `__start___ell_debug'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:3444: src/ofonod] Error 1

@ofborg ofborg bot requested review from Mic92 and dtzWill May 25, 2019 18:15
This was referenced Jul 25, 2019
Merged
Closed
@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 13, 2019

https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=48e31f9fc3cf3c486c3d27a67b2687f6df0c5c71 fixed the Ofono build issue.

@jtojnar jtojnar mentioned this pull request Aug 13, 2019
Merged
@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 13, 2019

Moved ofono to #66565

@jtojnar jtojnar mentioned this pull request Nov 14, 2019
Closed
@masipcat masipcat mentioned this pull request May 24, 2020
Closed
11 tasks
@jtojnar jtojnar closed this May 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jtojnar @infinisil @GrahamcOfBorg