sailsd: 0.1.1 -> 0.2.0 (#15445)

Sails has now been split into a few subcomponents, sailsd being the main
one. This package has been renamed to sailsd, the sailing simulation
daemon.

3 files changed, 43 insertions, 27 deletions

diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix
deleted file mode 100644
index ed965f73b92c..000000000000
--- a/pkgs/misc/sails/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk3, librsvg }:
-
-stdenv.mkDerivation rec {
-  version = "0.1.1";
-  name = "sails-${version}";
-  src = fetchurl {
-    url = "https://github.com/kragniz/sails/archive/v${version}.tar.gz";
-    sha256 = "0k55ib6cb78filgq3yrdib69qrzsny0209bq6h0v1yigry0sa62v";
-  };
-
-  buildInputs = [ cmake pkgconfig gtk3 librsvg ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  meta = with stdenv.lib; {
-    description = "Simulator for autonomous sailing boats";
-    homepage = https://github.com/kragniz/sails;
-    license = licenses.gpl3;
-    longDescription = ''
-      Sails is a simulator designed to test the AI of autonomous sailing
-      robots. It emulates the basic physics of sailing a small single sail
-      boat'';
-    maintainers = with maintainers; [ kragniz ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix
new file mode 100644
index 000000000000..7ae0ebbf84af
--- /dev/null
+++ b/pkgs/misc/sailsd/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, pkgconfig, jansson }:
+
+let
+  libsailing = fetchFromGitHub {
+    owner = "sails-simulator";
+    repo = "libsailing";
+    rev = "c24cddb717f81cd432868b8d41e04486c0a440fd";
+    sha256 = "0mna0c9n8lvfdf4y1iigjy3dlks70hq6jik52zkik2yxvkqv949f";
+  };
+in
+stdenv.mkDerivation rec {
+  version = "0.2.0";
+  name = "sailsd-${version}";
+  src = fetchFromGitHub {
+    owner = "sails-simulator";
+    repo = "sailsd";
+    rev = "${version}";
+    sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb";
+  };
+
+  buildInputs = [ pkgconfig jansson libsailing ];
+
+  INSTALL_PATH = "$(out)";
+
+  postUnpack = ''
+    rmdir $sourceRoot/libsailing
+    cp -r ${libsailing} $sourceRoot/libsailing
+    chmod 755 -R $sourceRoot/libsailing
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simulator daemon for autonomous sailing boats";
+    homepage = https://github.com/sails-simulator/sailsd;
+    license = licenses.gpl3;
+    longDescription = ''
+      Sails is a simulator designed to test the AI of autonomous sailing
+      robots. It emulates the basic physics of sailing a small single sail
+      boat'';
+    maintainers = with maintainers; [ kragniz ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfce29ac8e17..4c1bcd6ad417 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16539,7 +16539,7 @@ in
 
   xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { };
 
-  sails = callPackage ../misc/sails { };
+  sailsd = callPackage ../misc/sailsd { };
 
   canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };