nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 21:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluez: use systemdMinimal to avoid dep cycle

Browse Source 
also make test output unconditional
This commit is contained in:
bootstrap-prime 2022-07-03 17:12:46 -04:00
parent dad557524a
commit 3b9048a3ce
No known key found for this signature in database
GPG Key ID: B2D7CBCE8713622C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/bluez/default.nix
View File

@ -12,7 +12,7 @@
, pkg-config , pkg-config
, python3 , python3
, readline , readline
, systemd , systemdMinimal
, udev , udev
, withExperimental ? false , withExperimental ? false
}: let }: let
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
python3.pkgs.wrapPython python3.pkgs.wrapPython
]; ];
outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; outputs = [ "out" "dev" "test" ];
patches = [ patches = [
# https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5 # https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5
@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace tools/hid2hci.rules \ substituteInPlace tools/hid2hci.rules \
--replace /sbin/udevadm ${systemd}/bin/udevadm \ --replace /sbin/udevadm ${systemdMinimal}/bin/udevadm \
--replace "hid2hci " "$out/lib/udev/hid2hci " --replace "hid2hci " "$out/lib/udev/hid2hci "
# Disable some tests: # Disable some tests:
# - test-mesh-crypto depends on the following kernel settings: # - test-mesh-crypto depends on the following kernel settings:
@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
doCheck = stdenv.hostPlatform.isx86_64; doCheck = stdenv.hostPlatform.isx86_64;
postInstall = lib.optionalString doCheck '' postInstall = ''
mkdir -p $test/{bin,test} mkdir -p $test/{bin,test}
cp -a test $test cp -a test $test
pushd $test/test pushd $test/test