diff options
Diffstat (limited to 'pkgs/os-specific/linux/ell')
| -rw-r--r-- | pkgs/os-specific/linux/ell/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ell/fix-dbus-tests.patch | 65 |
2 files changed, 9 insertions, 78 deletions
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index a83e02ae6be..a43b9eff3c8 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -1,28 +1,24 @@ -{ stdenv +{ lib, stdenv , fetchgit , autoreconfHook -, pkgconfig +, pkg-config , dbus }: stdenv.mkDerivation rec { pname = "ell"; - version = "0.32"; + version = "0.41"; outputs = [ "out" "dev" ]; src = fetchgit { - url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; - rev = version; - sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2"; + url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; + rev = version; + sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM="; }; - patches = [ - ./fix-dbus-tests.patch - ]; - nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook ]; @@ -34,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://01.org/ell"; description = "Embedded Linux Library"; longDescription = '' @@ -42,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 dtzWill ]; + maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ]; }; } diff --git a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch b/pkgs/os-specific/linux/ell/fix-dbus-tests.patch deleted file mode 100644 index b494ba8b43c..00000000000 --- a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -140,6 +140,7 @@ - ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES) - - AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \ -+ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \ - -DCERTDIR=\""$(top_builddir)/unit/"\" - - pkgconfigdir = $(libdir)/pkgconfig ---- a/configure.ac -+++ b/configure.ac -@@ -14,6 +14,8 @@ - - AC_PREFIX_DEFAULT(/usr/local) - -+PKG_PROG_PKG_CONFIG -+ - COMPILER_FLAGS - - AC_LANG_C -@@ -131,6 +133,10 @@ - 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) -+ - AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes") - AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes") - ---- a/unit/test-dbus-message-fds.c -+++ b/unit/test-dbus-message-fds.c -@@ -51,7 +51,7 @@ - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = DBUS_DAEMON; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; ---- a/unit/test-dbus-properties.c -+++ b/unit/test-dbus-properties.c -@@ -48,7 +48,7 @@ - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = DBUS_DAEMON; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; ---- a/unit/test-dbus.c -+++ b/unit/test-dbus.c -@@ -45,7 +45,7 @@ - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = DBUS_DAEMON; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; |