diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 22:00:42 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 22:00:42 -0400 |
| commit | 84d00355e8b288a0700ea1590897b75297ec3877 (patch) | |
| tree | 5006e56e8ac8441f5af8fcef632ead1a0e561bb2 /pkgs/applications/video | |
| parent | dc552fd2ff745d5942ceb1ec2d1016a80f7f7307 (diff) | |
| parent | 6088a4793f2a83921b197a9185034934fcd96d02 (diff) | |
| download | nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.tar nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.tar.gz nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.tar.bz2 nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.tar.lz nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.tar.xz nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.tar.zst nixpkgs-84d00355e8b288a0700ea1590897b75297ec3877.zip | |
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/natron/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/wf-recorder/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 090b4ec9ffe..6299cd7e593 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation { Node-graph based, open-source compositing software. Similar in functionalities to Adobe After Effects and Nuke by The Foundry. ''; - homepage = https://natron.inria.fr/; + homepage = https://natron.fr/; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index cdeade6196e..6a15132fd24 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264 }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio }: stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "unstable-2019-03-12"; + version = "unstable-2019-04-21"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; - rev = "e6ea77a2569c04975cab8655f5ad4dbcf86df1f5"; - sha256 = "1jhj5syzy8i8f9b3j4g12jmc5fcsiv4df9hgribdvw61v5pfz9g1"; + rev = "ddb96690556371007e316577ed1b14f0cb62e13c"; + sha256 = "04amfd1kyklcj6nmmmf21dz333ykglvhxb3cbzak06v2fxlrp2w3"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ wayland wayland-protocols ffmpeg x264 ]; + buildInputs = [ wayland wayland-protocols ffmpeg x264 libpulseaudio ]; meta = with stdenv.lib; { description = "Utility program for screen recording of wlroots-based compositors"; |