From 81e99998f79f908f80865a65f008f831e01308e4 Mon Sep 17 00:00:00 2001 From: Simon Vandel Sillesen Date: Sat, 30 Jan 2016 20:08:52 +0100 Subject: [PATCH] sundtek: 2015-12-12 -> 2016-01-26 + service change * There is no need for hydra to build this, hence preferLocal * service change: do not hardcode a wait time of 5 seconds --- nixos/modules/services/misc/sundtek.nix | 2 +- pkgs/misc/drivers/sundtek/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/sundtek.nix b/nixos/modules/services/misc/sundtek.nix index 8438ef79904..e3234518c94 100644 --- a/nixos/modules/services/misc/sundtek.nix +++ b/nixos/modules/services/misc/sundtek.nix @@ -23,7 +23,7 @@ in Type = "oneshot"; ExecStart = '' ${pkgs.sundtek}/bin/mediasrv -d -v -p ${pkgs.sundtek}/bin ;\ - ${pkgs.sundtek}/bin/mediaclient --start=5 --wait-for-devices + ${pkgs.sundtek}/bin/mediaclient --start --wait-for-devices ''; ExecStop = "${pkgs.sundtek}/bin/mediaclient --shutdown"; RemainAfterExit = true; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 2587765da68..6c1ee05b765 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "2015-12-12"; + version = "2016-01-26"; rpath = makeLibraryPath [ "$out/lib" "$out/bin" ]; platform = with stdenv; if isx86_64 then "64bit" @@ -15,7 +15,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; - sha256 = "0pjg4xww25z36dp64az4gdc0fxhz51f5kb8zvj03hqc774fxzpbq"; + sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; }; name = "sundtek-${version}"; @@ -38,6 +38,8 @@ in patchelf --set-rpath ${rpath} {} \; ''; + preferLocalBuild = true; + meta = { description = "Sundtek MediaTV driver"; maintainers = [ maintainers.simonvandel ];