JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sundtek: 2015-12-12 -> 2016-01-26 + service change

Browse Source 
* There is no need for hydra to build this, hence preferLocal
* service change: do not hardcode a wait time of 5 seconds
This commit is contained in:
Simon Vandel Sillesen 2016-01-30 20:08:52 +01:00
parent 77f8f35d57
commit 81e99998f7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/sundtek.nix
View File

@ -23,7 +23,7 @@ in
Type = "oneshot"; Type = "oneshot";
ExecStart = '' ExecStart = ''
${pkgs.sundtek}/bin/mediasrv -d -v -p ${pkgs.sundtek}/bin ;\ ${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"; ExecStop = "${pkgs.sundtek}/bin/mediaclient --shutdown";
RemainAfterExit = true; RemainAfterExit = true;

6
pkgs/misc/drivers/sundtek/default.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib; with stdenv.lib;
let let
version = "2015-12-12"; version = "2016-01-26";
rpath = makeLibraryPath [ "$out/lib" "$out/bin" ]; rpath = makeLibraryPath [ "$out/lib" "$out/bin" ];
platform = with stdenv; platform = with stdenv;
if isx86_64 then "64bit" if isx86_64 then "64bit"
@ -15,7 +15,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
sha256 = "0pjg4xww25z36dp64az4gdc0fxhz51f5kb8zvj03hqc774fxzpbq"; sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp";
}; };
name = "sundtek-${version}"; name = "sundtek-${version}";
@ -38,6 +38,8 @@ in
patchelf --set-rpath ${rpath} {} \; patchelf --set-rpath ${rpath} {} \;
''; '';
preferLocalBuild = true;
meta = { meta = {
description = "Sundtek MediaTV driver"; description = "Sundtek MediaTV driver";
maintainers = [ maintainers.simonvandel ]; maintainers = [ maintainers.simonvandel ];