From 2c87db3cf20f8a0341f083dfd16bff4b3f62c55a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 17 Dec 2017 01:22:42 +0100
Subject: [PATCH] gnome3.mutter: clean up

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index be4a5e1087ad..39b2438a8f02 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,14 +1,11 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
+, pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
 , libgudev, libwacom, xwayland, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
-
   configureFlags = [
     "--with-x"
     "--disable-static"
@@ -28,12 +25,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
 
-  buildInputs = with gnome3;
-    [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
-      gnome3.geocode_glib libudev libinput libgudev libwacom
-      libcanberra_gtk3 zenity xkeyboard_config libxkbfile
-      libxkbcommon ];
+  buildInputs = with gnome3; [
+    glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+    gnome_desktop cairo pango cogl clutter zenity libstartup_notification
+    gnome3.geocode_glib libinput libgudev libwacom
+    libcanberra_gtk3 zenity xkeyboard_config libxkbfile
+    libxkbcommon
+  ];
 
   preFixup = ''
     wrapProgram "$out/bin/mutter" \
@@ -45,6 +43,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
   };
-
 }