From 586dd54199bab702dfee73af2ac6a020f14dfcd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 May 2016 11:47:34 +0200 Subject: [PATCH] pitivi: unbreak build [Breakage introduced in commit 5c4e00b6b797c444c0a0ca434c3b6f ("gst_all_1: 1.6.1 -> 1.8.0 (#14628)").] The build is failing due to a Wayland test/example program (/tests/examples/waylandsink) being built with a gtk3 input without Wayland support (or detection is failing): main.c:28:2: error: #error "Wayland is not supported in GTK+" Fix it by explicitly disabling wayland; pass --enable-wayland=no to configure. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a05669559b..3bbf6b557e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2832,7 +2832,11 @@ in pitivi = callPackage ../applications/video/pitivi { gst = gst_all_1 // { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation - (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; }); + (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; + # Fix this build error in ./tests/examples/waylandsink: + # main.c:28:2: error: #error "Wayland is not supported in GTK+" + configureFlags = attrs.configureFlags or "" + "--enable-wayland=no"; + }); }; };