diff options
| author | tv <tv@krebsco.de> | 2020-06-02 23:35:17 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-06-02 23:35:17 +0200 |
| commit | 09c9f8f7fb04be39390b6f65966789c1bf6333e5 (patch) | |
| tree | b0cb0f718b40517b0645a38169e67b1088566f64 /makefu/2configs/tools | |
| parent | 09e620c79b70e495e9651e8e5c1b160dd1b5fb8d (diff) | |
| parent | 211e2ca6b9a1d8b4dd92071065b0b595123fe282 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/tools')
| -rw-r--r-- | makefu/2configs/tools/dev.nix | 1 | ||||
| -rw-r--r-- | makefu/2configs/tools/extra-gui.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/tools/studio.nix | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 43892ed2c..f184b5be5 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -21,6 +21,7 @@ brain whatsupnix nixpkgs-pytools + hydra-check # git-related git-preview tig diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix index 7c01104a0..49b36a5d7 100644 --- a/makefu/2configs/tools/extra-gui.nix +++ b/makefu/2configs/tools/extra-gui.nix @@ -4,7 +4,7 @@ users.users.makefu.packages = with pkgs;[ # media gimp - mirage + # mirage - last time available in 19.09 inkscape libreoffice # skype diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix index 2c8ca399d..0998a695e 100644 --- a/makefu/2configs/tools/studio.nix +++ b/makefu/2configs/tools/studio.nix @@ -1,6 +1,9 @@ { pkgs, ... }: { + nixpkgs.config.permittedInsecurePackages = [ + "openssl-1.0.2u" # required for studio-link + ]; users.users.makefu.packages = with pkgs; [ obs-studio studio-link |