Merge branch 'master' into staging

2016-08-24 11:57:44 +01:00
parent f3886a6fba 4d4980d9f8
commit 78b7529ee3
46 changed files with 363 additions and 50 deletions
--- a/pkgs/misc/sailsd/default.nix
+++ b/pkgs/misc/sailsd/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
    chmod 755 -R $sourceRoot/libsailing
  '';

+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace gcc cc
+  '';
+
  meta = with stdenv.lib; {
    description = "Simulator daemon for autonomous sailing boats";
    homepage = https://github.com/sails-simulator/sailsd;