diff options
author | Profpatsch <mail@profpatsch.de> | 2021-04-23 17:45:45 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-04-23 17:45:45 +0200 |
commit | 1fe6dfaf8332462e5b1d75f60d7317050eee88bf (patch) | |
tree | 89c438e022703b2d1970f4218ad0f627fb05a5f3 /machines | |
parent | 84d6379392b9f580424ef1ef25c499e698a7d69f (diff) |
machines/profpatsch: use unfreeAndNonDistributablePkgs for convert
Diffstat (limited to 'machines')
-rw-r--r-- | machines/profpatsch/legosi.nix | 2 | ||||
-rw-r--r-- | machines/profpatsch/pkgs.nix | 4 | ||||
-rw-r--r-- | machines/profpatsch/shiki.nix | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/machines/profpatsch/legosi.nix b/machines/profpatsch/legosi.nix index 8cf8df63..3866af73 100644 --- a/machines/profpatsch/legosi.nix +++ b/machines/profpatsch/legosi.nix @@ -92,7 +92,7 @@ in { "/tmp" "/usr" # /var/lib is what we want because it contains all services, - # but let’s be generous and keep everthing in /var except log + # but let’s be generous and keep everything in /var except log "/var/log" ]; diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index 8174399d..ae13e7ef 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -7,7 +7,9 @@ assert withUnfree -> unfreeAndNonDistributablePkgs != null; let mpv = pkgs.wrapMpv pkgs.mpv-unwrapped { - scripts = [ pkgs.mpvScripts.convert ]; + scripts = [ + (unfreeAndNonDistributablePkgs pkgs.mpvScripts.convert) + ]; }; beets = pkgs.beets.override { enableAlternatives = true; }; diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index 3b9c04d6..95e35972 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -125,10 +125,6 @@ in { auto-optimise-store = true ''; - nixpkgs.config.allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [ - "mpv-convert-script" - ]; - ########## # Network |