about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2018-02-22 11:52:04 +0800
committerPeter Hoeg <peter@hoeg.com>2018-02-22 11:52:14 +0800
commit89343b4d43665e63bb49286f4aa96038d4015d30 (patch)
treee69a6526efe06e5bb62070456b773ef73dfddeba
parentebec14212e7cd2e6fac889b55b90ff1e14512b75 (diff)
downloadnixlib-89343b4d43665e63bb49286f4aa96038d4015d30.tar
nixlib-89343b4d43665e63bb49286f4aa96038d4015d30.tar.gz
nixlib-89343b4d43665e63bb49286f4aa96038d4015d30.tar.bz2
nixlib-89343b4d43665e63bb49286f4aa96038d4015d30.tar.lz
nixlib-89343b4d43665e63bb49286f4aa96038d4015d30.tar.xz
nixlib-89343b4d43665e63bb49286f4aa96038d4015d30.tar.zst
nixlib-89343b4d43665e63bb49286f4aa96038d4015d30.zip
dbus-broker: 9 -> 11
-rw-r--r--pkgs/os-specific/linux/dbus-broker/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 51d0fb5e1254..6e7034e0c1e1 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
-, dbus, glib, systemd }:
+, dbus, glib, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
   name = "dbus-broker-${version}";
-  version = "9";
+  version = "11";
 
   src = fetchFromGitHub {
     owner           = "bus1";
     repo            = "dbus-broker";
     rev             = "v${version}";
-    sha256          = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab";
+    sha256          = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ docutils meson ninja pkgconfig ];
 
-  buildInputs = [ dbus glib systemd ];
+  buildInputs = [ dbus glib linuxHeaders systemd ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f05623beb0d..5e3d0c118bba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1056,7 +1056,10 @@ with pkgs;
 
   devmem2 = callPackage ../os-specific/linux/devmem2 { };
 
-  dbus-broker = callPackage ../os-specific/linux/dbus-broker {};
+  # dbus-broker needs kernel 4.14+
+  dbus-broker = callPackage ../os-specific/linux/dbus-broker {
+    linuxHeaders = linuxHeaders_4_15;
+  };
 
   ioport = callPackage ../os-specific/linux/ioport {};