diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-05-15 18:17:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-05-15 18:17:05 +0200 |
commit | d72c6a72d0184bb6e659ca253409e5310d335962 (patch) | |
tree | 549dc179df6b52903384a9d5c877f9c3d34ebc28 /pkgs/applications/video | |
parent | a44988ac0d3c7c60a320d5368d195ad590b62678 (diff) | |
parent | f3194760f1e6f5e5e92d8a4302bc58b80e399ba7 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/byzanz/default.nix | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 2919cb10ca3f8..5e60bb7fd9086 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,13 +1,26 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv +, fetchgit +, wrapGAppsHook +, cairo +, glib +, gnome +, gst_all_1 +, gtk3 +, intltool +, libtool +, pkg-config +, which +, xorg +}: stdenv.mkDerivation { - version = "0.2.3.alpha"; pname = "byzanz"; + version = "unstable-2016-03-12"; src = fetchgit { url = "https://gitlab.gnome.org/Archive/byzanz"; - rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; - sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; + rev = "81235d235d12c9687897f7fc6ec0de1feaed6623"; + hash = "sha256-3DUwXCPBAmeCRlDkiPUgwNyBa6bCvC/TLguMCK3bo4E="; }; patches = [ ./add-amflags.patch ]; @@ -16,11 +29,31 @@ stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ + "-Wno-error=deprecated-declarations" + "-Wno-error=incompatible-pointer-types" + ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] - ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); + buildInputs = [ + which + gnome.gnome-common + glib + intltool + libtool + cairo + gtk3 + xorg.xwininfo + xorg.libXdamage + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-plugins-good + gst-plugins-ugly + gst-libav + wrapGAppsHook + ]); meta = with lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; |