From 41ef8a13b588cc762ac20e7db5e76a488e712148 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 12:48:22 +0800 Subject: [PATCH] Revert "dbus-broker: 9 -> 11" This reverts commit 89343b4d43665e63bb49286f4aa96038d4015d30. Breaks master. --- pkgs/os-specific/linux/dbus-broker/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 6e7034e0c1e..51d0fb5e125 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, linuxHeaders, systemd }: +, dbus, glib, systemd }: stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "11"; + version = "9"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; + sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; fetchSubmodules = true; }; nativeBuildInputs = [ docutils meson ninja pkgconfig ]; - buildInputs = [ dbus glib linuxHeaders systemd ]; + buildInputs = [ dbus glib systemd ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e3d0c118bb..1f05623beb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1056,10 +1056,7 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; - # dbus-broker needs kernel 4.14+ - dbus-broker = callPackage ../os-specific/linux/dbus-broker { - linuxHeaders = linuxHeaders_4_15; - }; + dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; ioport = callPackage ../os-specific/linux/ioport {};