signage: bring in from external repo
This is b28e6f07aa48f1e2f01eb37bffa180f97a7b03bd from
https://code.hackerspace.pl/q3k/love2d-signage/. We only keep code
commited by inf and q3k, and we're both now licensing this code under
the ISC license, as per COPYING in the root of hscloud.
Change-Id: Ibeee2e6923605e4b1a17a1d295867c056863ef59
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1335
Reviewed-by: informatic <informatic@hackerspace.pl>
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/hswaw/machines/tv/common.nix b/hswaw/machines/tv/common.nix
index c1b8e7c..228d780 100644
--- a/hswaw/machines/tv/common.nix
+++ b/hswaw/machines/tv/common.nix
@@ -1,6 +1,6 @@
# RPi4 as TV kiosk.
-{ config, pkgs, ... }:
+{ config, pkgs, workspace, ... }:
let
nixos-hardware = builtins.fetchGit {
@@ -32,12 +32,6 @@
networking.domain = "waw.hackerspace.pl";
time.timeZone = "Europe/Warsaw";
- nixpkgs.overlays = [
- (self: super: {
- signage = self.callPackage ./signage.nix {};
- })
- ];
-
sound.enable = true;
services.pipewire = {
enable = true;
@@ -107,7 +101,7 @@
'';
in pkgs.writeScriptBin "signage-wrapped" ''
#!/usr/bin/env bash
- SIGNAGE_CONFIG=${config} ${signage}/bin/signage
+ SIGNAGE_CONFIG=${config} ${workspace.hswaw.signage.prod}/bin/signage
'')
firefox foot wayvnc
vim rxvt-unicode-unwrapped.terminfo
diff --git a/hswaw/machines/tv/signage.nix b/hswaw/machines/tv/signage.nix
deleted file mode 100644
index 449b0a3..0000000
--- a/hswaw/machines/tv/signage.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ love, curl, fetchFromGitHub, fetchgit, stdenv, lib, ... }:
-let
- love12 = (love.overrideAttrs (oa: {
- version = "12.0-dev";
- src = fetchFromGitHub {
- owner = "love2d";
- repo = "love";
- rev = "d586d1847446f5212d5f7e9efb94e50fcfba7d77";
- sha256 = "sha256-gTpVtyqXV6/GsezuCpooaY+x5tPfOF9p1b83v4kKR4E=";
- };
- makeFlags = [
- "CPPFLAGS=-DHTTPS_BACKEND_CURL"
- ];
- buildInputs = oa.buildInputs ++ [ curl ];
- NIX_LDFLAGS = "-lcurl";
- enableParallelBuilding = true;
- }));
-
- signage = stdenv.mkDerivation {
- name = "signage";
- src = fetchgit {
- url = "https://code.hackerspace.pl/q3k/love2d-signage";
- rev = "6c14716222e28b004861b3926560bf21d519fb00";
- sha256 = "sha256-dfZ6Q320+ukMt9Q2igcARBM72LRbW5ltEvxrngSW8fQ=";
- };
-
- installPhase = ''
- mkdir -p $out/share/signage
- cp -rv $src/* $out/share/signage/
-
- mkdir -p $out/bin/
- cat <<EOF >$out/bin/signage
- #!/usr/bin/env bash
- ${love12}/bin/love $out/share/signage
- EOF
- chmod +x $out/bin/signage
- '';
- };
-
-in signage