chore(3p/sources): Bump channels & overlays
* //users/tazjin/emacs: string-edit was renamed to string-edit-at-point
1b2c64ce1b
* //users/grfn/…/modules:
- readyset.nix: use rain from nixpkgs
- obs.nix: use input-overlay from nixpkgs (newer version, untested)
Change-Id: I5887078cee22673c129d186a8448855b92d7b250
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7306
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
parent
ff658006f0
commit
419a9ab0fe
5 changed files with 21 additions and 85 deletions
|
|
@ -10,21 +10,7 @@
|
|||
(writeShellScriptBin "dotclip" "xclip -out -selection clipboard | dot -Tpng | feh -")
|
||||
(writeShellScriptBin "dotcontroller" "curl -s localhost:6033/graph | dot -Tpng | feh -")
|
||||
|
||||
# TODO(grfn): rain fails to build with Go >=1.18, investigate.
|
||||
(buildGo117Module rec {
|
||||
pname = "rain";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9";
|
||||
};
|
||||
|
||||
vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
|
||||
})
|
||||
|
||||
rain
|
||||
awscli2
|
||||
amazon-ecr-credential-helper
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,60 +1,10 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
libuiohook = stdenv.mkDerivation rec {
|
||||
pname = "libuiohook";
|
||||
version = "1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kwhat";
|
||||
repo = "libuiohook";
|
||||
rev = version;
|
||||
sha256 = "1isfxn3cfrdqq22d3mlz2lzm4asf9gprs7ww2xy9c3j3srk9kd7r";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libtool
|
||||
autoconf
|
||||
automake
|
||||
xlibsWrapper
|
||||
xorg.libXtst
|
||||
xorg.libXinerama
|
||||
xorg.libxkbfile
|
||||
libxkbcommon
|
||||
];
|
||||
};
|
||||
|
||||
obs-input-overlay = stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "4.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dklg0dx9ijwyhgwcaqz859rbpaivmqxqvh9w3h4byrh5pnkz8bf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio libuiohook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i CMakeLists.txt \
|
||||
-e '2iinclude(${obs-studio.src}/cmake/Modules/ObsHelpers.cmake)' \
|
||||
-e '2ifind_package(LibObs REQUIRED)'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
];
|
||||
};
|
||||
inherit (pkgs) obs-studio;
|
||||
obs-input-overlay = pkgs.obs-studio-plugins.input-overlay;
|
||||
in
|
||||
|
||||
{
|
||||
home.packages = [
|
||||
obs-studio
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue