-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
Librem5 phone apps #57614
Closed
Closed
Librem5 phone apps #57614
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
8.has: package (new)
This PR adds a new package
11.by: package-maintainer
This PR was created by the maintainer of the package it changes
10.rebuild-darwin: 0
This PR does not cause any packages to rebuild on Darwin
10.rebuild-linux: 1-10
labels
Mar 14, 2019
Looks like we need ell for ofono. |
22 tasks
I added
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))
+
|
GrahamcOfBorg
added
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Mar 24, 2019
GrahamcOfBorg
removed
the
2.status: merge conflict
This PR has merge conflicts with the target branch
label
Mar 24, 2019
Fixed the Ell build with a hack but now ofono fails on a linking issue:
|
This was referenced Jul 25, 2019
Merged
https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=48e31f9fc3cf3c486c3d27a67b2687f6df0c5c71 fixed the Ofono build issue. |
Merged
Moved ofono to #66565 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
8.has: package (new)
This PR adds a new package
10.rebuild-darwin: 0
This PR does not cause any packages to rebuild on Darwin
10.rebuild-linux: 1-10
11.by: package-maintainer
This PR was created by the maintainer of the package it changes
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Another mostly useless draft I am posting because it might be interesting for someone.
Other interesting software:
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)