From a811e37d1c7bc6e0b68e7bf391fadd371db22850 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:35:11 -0500 Subject: [PATCH] roboschool: pin to qt514 --- pkgs/development/python-modules/roboschool/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 53b909844ac..9387f3775be 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -4,7 +4,7 @@ , python , fetchFromGitHub , fetchpatch -, qt5 +, qtbase , boost , assimp , gym @@ -33,14 +33,14 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig - qt5.qtbase # needs the `moc` tool + qtbase # needs the `moc` tool which ]; buildInputs = [ bullet-roboschool assimp - qt5.qtbase + qtbase boost ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4702a2ad063..d7c614b9f70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6086,8 +6086,9 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; - }; # use normal pkgconfig, not the python package + inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (qt5) qtbase; + }; robot-detection = callPackage ../development/python-modules/robot-detection { };