diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 17:28:37 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 17:28:37 +0100 |
| commit | e100119827474928636c2ed9a9772f3c5107663b (patch) | |
| tree | 80833a41f9f067125fea734b134b0a9424fd7159 /hel | |
| parent | 000d46fbd462dc59aa143261b894f9c470e54040 (diff) | |
| parent | f655f88cbbc334ad56a79c2287f18defa5aa98ba (diff) | |
| download | nixos-e100119827474928636c2ed9a9772f3c5107663b.tar nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.gz nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.bz2 nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.xz nixos-e100119827474928636c2ed9a9772f3c5107663b.zip | |
Merge branch 'master' of git:nixos
Diffstat (limited to 'hel')
| -rw-r--r-- | hel/recv-media.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hel/recv-media.nix b/hel/recv-media.nix index 52d5bae6..a074e76b 100644 --- a/hel/recv-media.nix +++ b/hel/recv-media.nix | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | , showTitle ? true | 6 | , showTitle ? true |
| 7 | , ffmpeg ? null | 7 | , ffmpeg ? null |
| 8 | , gnused ? null | 8 | , gnused ? null |
| 9 | , wrapperDir ? "/run/wrappers/bin" | ||
| 9 | }: | 10 | }: |
| 10 | 11 | ||
| 11 | assert showTitle -> ffmpeg != null && gnused != null && notifyUser != null; | 12 | assert showTitle -> ffmpeg != null && gnused != null && notifyUser != null; |
| @@ -15,7 +16,7 @@ writeScriptBin "recv-media" '' | |||
| 15 | 16 | ||
| 16 | pid=$? | 17 | pid=$? |
| 17 | 18 | ||
| 18 | PATH=${eject}/bin:${coreutils}/bin:${if showTitle then ''${ffmpeg}/bin:${gnused}/bin:'' else ""}/var/setuid-wrappers | 19 | PATH=${eject}/bin:${coreutils}/bin:${if showTitle then ''${ffmpeg}/bin:${gnused}/bin:'' else ""}${wrapperDir} |
| 19 | 20 | ||
| 20 | exec 1> >(logger --id=$pid -t recv-media -p user.notice) | 21 | exec 1> >(logger --id=$pid -t recv-media -p user.notice) |
| 21 | exec 2> >(logger --id=$pid -t recv-media -p user.error) | 22 | exec 2> >(logger --id=$pid -t recv-media -p user.error) |