diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-02-22 12:48:22 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2018-02-22 12:48:22 +0800 |
| commit | 41ef8a13b588cc762ac20e7db5e76a488e712148 (patch) | |
| tree | 2dc885db0b0ff0db92023d8f5850092c78a1fffe /pkgs | |
| parent | 89343b4d43665e63bb49286f4aa96038d4015d30 (diff) | |
| download | nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.tar nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.tar.gz nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.tar.bz2 nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.tar.lz nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.tar.xz nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.tar.zst nixlib-41ef8a13b588cc762ac20e7db5e76a488e712148.zip | |
Revert "dbus-broker: 9 -> 11"
This reverts commit 89343b4d43665e63bb49286f4aa96038d4015d30. Breaks master.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 8 | ||||
| -rw-r--r-- | 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 6e7034e0c1e1..51d0fb5e1254 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 5e3d0c118bba..1f05623beb0d 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 {}; |