diff options
| author | bootstrap-prime <bootstrap.prime@gmail.com> | 2022-07-03 17:12:46 -0400 |
|---|---|---|
| committer | bootstrap-prime <bootstrap.prime@gmail.com> | 2022-07-23 20:37:14 -0400 |
| commit | 3b9048a3cefb6e86af60348513624ea691cd7f41 (patch) | |
| tree | 7a4e6f46c091351d671b0e8fb6780727d2de94ff | |
| parent | dad557524a8572426d03640c6f7b193027dac51a (diff) | |
| download | nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.tar nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.tar.gz nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.tar.bz2 nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.tar.lz nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.tar.xz nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.tar.zst nixpkgs-3b9048a3cefb6e86af60348513624ea691cd7f41.zip | |
bluez: use systemdMinimal to avoid dep cycle
also make test output unconditional
| -rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 3805f99e0a5..d09ef77fb0d 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -12,7 +12,7 @@ , pkg-config , python3 , readline -, systemd +, systemdMinimal , udev , withExperimental ? false }: let @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { python3.pkgs.wrapPython ]; - outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; + outputs = [ "out" "dev" "test" ]; patches = [ # https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5 @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace tools/hid2hci.rules \ - --replace /sbin/udevadm ${systemd}/bin/udevadm \ + --replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " # Disable some tests: # - test-mesh-crypto depends on the following kernel settings: @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform.isx86_64; - postInstall = lib.optionalString doCheck '' + postInstall = '' mkdir -p $test/{bin,test} cp -a test $test pushd $test/test |