Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
parent 940c35568b c6ff360cc4
commit e520d6af29
36 changed files with 187 additions and 83 deletions
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -44,12 +44,12 @@ buildPythonPackage rec {

  checkInputs = [
    nose dbus dbus-python which pycodestyle pyflakes
-    pygobject3 bluez bluez.test networkmanager
+    pygobject3 bluez (lib.getOutput "test" bluez) networkmanager
  ];

  checkPhase = ''
    runHook preCheck
-    export PATH="$PATH:${bluez.test}/test";
+    export PATH="$PATH:${lib.getOutput "test" bluez}/test";
    nosetests -v
    runHook postCheck
  '';