gnome3.mutter: clean up

This commit is contained in:
Jan Tojnar 2017-12-17 01:22:42 +01:00
parent b212125b54
commit 2c87db3cf2
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 10 additions and 12 deletions

View File

@ -1,14 +1,11 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, libgudev, libwacom, xwayland, autoreconfHook }: , libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; 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 = [ configureFlags = [
"--with-x" "--with-x"
"--disable-static" "--disable-static"
@ -28,12 +25,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
buildInputs = with gnome3; buildInputs = with gnome3; [
[ glib gobjectIntrospection gtk gsettings_desktop_schemas upower glib gobjectIntrospection gtk gsettings_desktop_schemas upower
gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 gnome_desktop cairo pango cogl clutter zenity libstartup_notification
gnome3.geocode_glib libudev libinput libgudev libwacom gnome3.geocode_glib libinput libgudev libwacom
libcanberra_gtk3 zenity xkeyboard_config libxkbfile libcanberra_gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon ]; libxkbcommon
];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/mutter" \ wrapProgram "$out/bin/mutter" \
@ -45,6 +43,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
license = licenses.gpl2;
}; };
} }