summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-15 21:13:46 +0200
committerlassulus <lass@lassul.us>2017-06-15 21:13:46 +0200
commitc6605a3ab8f6a5098bbd3e011de50e37bf242a05 (patch)
tree57a0868c0dbe34aa553c5175c2f3ab29add0a330 /makefu
parentfde07d4e5ed92309ca1c7570c936ec3d324ca2f3 (diff)
parent70260c70943cfcad80c268920566c1a858870b28 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/wry.nix4
-rw-r--r--makefu/2configs/deployment/led-fader.nix2
-rw-r--r--makefu/2configs/mail-client.nix3
-rw-r--r--makefu/5pkgs/studio-link/default.nix69
4 files changed, 74 insertions, 4 deletions
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 62ca171a9..f5097bf40 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -22,8 +22,8 @@ in {
# ../2configs/nginx/euer.test.nix
# collectd
- ../2configs/logging/central-stats-client.nix
- ../2configs/logging/central-logging-client.nix
+ ../2configs/stats/client.nix
+ ../2configs/logging/client.nix
../2configs/tinc/retiolum.nix
# ../2configs/torrent.nix
diff --git a/makefu/2configs/deployment/led-fader.nix b/makefu/2configs/deployment/led-fader.nix
index e4d62ae77..50023693d 100644
--- a/makefu/2configs/deployment/led-fader.nix
+++ b/makefu/2configs/deployment/led-fader.nix
@@ -29,7 +29,7 @@ in {
environment = {
NIX_PATH = "/var/src";
};
- after = [ (lib.optional config.services.mosqitto.enable "mosquitto.service") ];
+ # after = [ (lib.optional config.services.mosqitto.enable "mosquitto.service") ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
# User = "nobody"; # need a user with permissions to run nix-shell
diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix
index 8319b89ce..e08aadc5e 100644
--- a/makefu/2configs/mail-client.nix
+++ b/makefu/2configs/mail-client.nix
@@ -7,10 +7,11 @@ with import <stockholm/lib>;
gnupg
imapfilter
msmtp
- mutt
notmuch
+ neomutt
offlineimap
openssl
w3m
];
+
}
diff --git a/makefu/5pkgs/studio-link/default.nix b/makefu/5pkgs/studio-link/default.nix
new file mode 100644
index 000000000..6fa40139b
--- /dev/null
+++ b/makefu/5pkgs/studio-link/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
+, nss, pango, systemd, xorg, utillinuxMinimal, unzip, openssl, zlib, libjack2 }:
+
+let
+ libPath = stdenv.lib.makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gcc.cc
+ gdk_pixbuf
+ glib
+ gnome2.GConf
+ gtk2
+ nspr
+ nss
+ pango
+
+ openssl
+ zlib
+ libjack2
+
+ systemd
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ ];
+in
+stdenv.mkDerivation rec {
+ name = "studio-link-${version}";
+ version = "17.03.1-beta";
+ src = fetchurl {
+ url = "https://github.com/Studio-Link-v2/backend/releases/download/v${version}/studio-link-standalone-linux.zip";
+ sha256 = "1y21nymin7iy64hcffc8g37fv305b1nvmh944hkf7ipb06kcx6r9";
+ };
+ buildInputs = [ unzip ];
+ phases = ["unpackPhase" "installPhase" "fixupPhase"];
+ unpackPhase = ''
+ unzip $src
+ '';
+ installPhase = ''
+ mkdir -p $out/bin
+ cp studio-link-standalone $out/bin/studio-link
+ chmod +x $out/bin/studio-link
+ '';
+ postFixup = ''
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/bin/studio-link"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://studio-link.com;
+ description = "Voip transfer";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ makefu ];
+ };
+}