home

commit f70dfab605880d038f5a24479d2d00c57d2cf517
parent 4a68f3f4a778c2ff4e3c3ed454e07a9df453f00a
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 11 Jan 2019 10:42:01 +0100

obs-studio is fixed upstream (unstable)…

… so removing my temporarly hack

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
machines/shikoku.nix
 | 
12
+-----------
M
machines/wakasu.nix
 | 
12
+-----------

2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/machines/shikoku.nix b/machines/shikoku.nix
@@ -1,15 +1,5 @@
 { pkgs, ... }:
 
-let
-  my-obs = pkgs.obs-studio.overrideDerivation (oldAttrs: {
-      patches = [
-        (pkgs.fetchpatch {
-          url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
-          sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq";
-        })
-      ];
-    });
-in
 {
   imports = [
     ./base.nix
@@ -43,7 +33,7 @@ in
   home.file."src/github.com/knative/default.nix".source = ../projects/knative/default.nix;
 
   home.packages = with pkgs; [
-    my-obs
+    obs-studio
     virtmanager
   ];
 }
diff --git a/machines/wakasu.nix b/machines/wakasu.nix
@@ -1,15 +1,5 @@
 { pkgs, ...}:
 
-let
-  my-obs = pkgs.obs-studio.overrideDerivation (oldAttrs: {
-      patches = [
-        (pkgs.fetchpatch {
-          url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
-          sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq";
-        })
-      ];
-    });
-in
 {
   imports = [
     ./base.nix
@@ -37,7 +27,7 @@ in
     podman.enable = true;
   };
   home.packages = with pkgs; [
-    my-obs
+    obs-studio
     mattermost-desktop
     slack
     virtmanager