summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/tools
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-04-22 16:44:20 +0200
committerlassulus <lassulus@lassul.us>2020-04-22 16:44:20 +0200
commit96102f20ccd6d42163b9455886b1ef60e2b6724f (patch)
tree9fd877a0973eeebd48a5abc0bacb170224c1b2d2 /makefu/2configs/tools
parent39236226cdf8692b5904831471d9ad45942146a4 (diff)
parentc80ca049f1db5725a10f7110aeb5e63eb5b88611 (diff)
Merge remote-tracking branch 'gum/20.03'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r--makefu/2configs/tools/extra-gui.nix2
-rw-r--r--makefu/2configs/tools/studio.nix3
2 files changed, 4 insertions, 1 deletions
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