From 4c01701af3e9125a8f3610ee51faadde8dada588 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Thu, 5 May 2022 16:29:18 +0200 Subject: [PATCH] makemkv: Remove hardcodes/hard dependencies Even without a drive it is useful for working with disc images. --- users/simon/modules/makemkv.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/users/simon/modules/makemkv.nix b/users/simon/modules/makemkv.nix index 54aa10d..adbb720 100644 --- a/users/simon/modules/makemkv.nix +++ b/users/simon/modules/makemkv.nix @@ -3,6 +3,7 @@ let # TODO: Do not hardcode /dev/{sr0,sg2} (right paths on sayuri) makemkv-sandbox = pkgs.writeShellScriptBin "makemkv-sandbox" /* bash */ '' set -euo pipefail + mkdir -p $HOME/.MakeMKV ${pkgs.bubblewrap}/bin/bwrap \ --tmpfs /tmp \ --proc /proc \ @@ -17,10 +18,10 @@ let --ro-bind /run/opengl-driver /run/opengl-driver \ --ro-bind /etc/fonts /etc/fonts \ --new-session \ - --bind /home/simon/.MakeMKV /home/simon/.MakeMKV \ - --dev-bind /dev/sr0 /dev/sr0 \ - --dev-bind /dev/sg2 /dev/sg2 \ - --dev-bind /sys/bus/scsi /sys/bus/scsi \ + --bind $HOME/.MakeMKV $HOME/.MakeMKV \ + --dev-bind-try /dev/sr0 /dev/sr0 \ + --dev-bind-try /dev/sg2 /dev/sg2 \ + --dev-bind-try /sys/bus/scsi /sys/bus/scsi \ --bind ''${PWD_TARGET:-$PWD} ''${PWD_TARGET:-$PWD} \ ${pkgs.unstable.makemkv}/bin/makemkv '';