Commit Graph

15 Commits

Author SHA1 Message Date
=
efb56cec43
gazebo7: Fix gazebo-config.cmake output file 2016-09-27 10:30:27 +02:00
Robin Gloster
f00c750014 qgroundcontrol: remove unused overrideCC and comment 2016-08-24 22:41:41 +00:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing
changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
2016-06-23 09:25:10 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Nikolay Amiantov
51f479465c qgroundcontrol: fix build 2016-05-29 19:51:22 +03:00
Nicolò Balzarotti
c1c0c99af3 yarp: 2.3.64 -> 2.3.65 (#15662) 2016-05-24 13:30:52 +02:00
Nikolay Amiantov
fb2c651647 qgroundcontrol: move to qmakeHook
This reverts commit 11294eaf168b524da9601c8b35d71b72ba3ad040.
2016-04-20 18:55:48 +03:00
aszlig
11294eaf16
qgroundcontrol: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qgroundcontrol
override the whole configurePhase, so this hook isn't run at all.

Instead of using pushd/popd, I'm making it a bit more readable by just
spawning a subshell with the right working directory.

This fixes the build of qgroundcontrol and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
01900ac06e
qgroundcontrol: Drop unused preConfigure phase
The configurePhase is overridden here and the preConfigure hook isn't
referenced otherwise in the package, so it's basically dead code.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Patrick Callahan
66b5055b95 gazebo: init at 6.5.1 and 7.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan
f30e40df69 qgroundcontrol: init at 2.9.4 2016-03-24 20:06:31 -07:00