fix merge

home.nix

@@ -19,7 +19,10 @@
     nixops
     ldns
 
-#    danstable.mangohud
+    file
+    tmux
+
+    #danstable.mangohud
 
     unstable.steam
     dolphinEmuMaster

overlays/av1client.nix

@@ -0,0 +1,24 @@
+self: super:
+{
+  av1client = super.stdenv.mkDerivation rec {
+    name = "av1client-${version}";
+    version = "0.5.0";
+
+    src = ~/Documents/av1master/src/static;
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp client.sh $out/bin/av1client
+
+      sed -i 's,sleep,${super.coreutils}/bin/sleep,' $out/bin/av1client
+      sed -i 's,rm,${super.coreutils}/bin/rm,' $out/bin/av1client
+      sed -i 's,curl,${super.curl}/bin/curl --cacert ${super.cacert}/etc/ssl/certs/ca-bundle.crt,' $out/bin/av1client
+      sed -i 's,jq,${super.jq}/bin/jq,' $out/bin/av1client
+      sed -i 's,ffmpeg ,${super.ffmpeg}/bin/ffmpeg ,' $out/bin/av1client
+      sed -i 's,aomenc ,${self.mylibaom}/bin/aomenc ,' $out/bin/av1client
+
+      chmod +x $out/bin/av1client
+    '';
+
+  };
+}

overlays/libaom.nix

@@ -4,8 +4,8 @@ self: super:
     version = "1.0.0-g33e9b7fb1";
     src = super.fetchgit {
       url = "https://aomedia.googlesource.com/aom";
-      rev = "33e9b7fb1c5f14657142b8a54e5166f5240821d7";
+      rev = "e6a12489069fdf7188963950cdec8ef7ef333f1d";
-      sha256 = "10viwhjh0qm600ych8652q2a04351qy6fj26qzm4nszncflj4g7w";
+      sha256 = "1ncvn5l8zczkjxfmld2ppcwqkc80pm38y1qaf1yil1llfx85xvhh";
     };