public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

roboschool: pin to qt514

Browse Source
This commit is contained in:
Thomas Tuegel 2020-09-07 10:35:11 -05:00
parent c5059b88b5
commit a811e37d1c
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/roboschool/default.nix
View File

@ -4,7 +4,7 @@
, python , python
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, qt5 , qtbase
, boost , boost
, assimp , assimp
, gym , gym
@ -33,14 +33,14 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
qt5.qtbase # needs the `moc` tool qtbase # needs the `moc` tool
which which
]; ];
buildInputs = [ buildInputs = [
bullet-roboschool bullet-roboschool
assimp assimp
qt5.qtbase qtbase
boost boost
]; ];

5
pkgs/top-level/python-packages.nix
View File

@ -6086,8 +6086,9 @@ in {
robomachine = callPackage ../development/python-modules/robomachine { }; robomachine = callPackage ../development/python-modules/robomachine { };
roboschool = callPackage ../development/python-modules/roboschool { roboschool = callPackage ../development/python-modules/roboschool {
inherit (pkgs) pkgconfig; inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package
}; # use normal pkgconfig, not the python package inherit (qt5) qtbase;
};
robot-detection = callPackage ../development/python-modules/robot-detection { }; robot-detection = callPackage ../development/python-modules/robot-detection { };