alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gnome3.mutter: fix libgudev 232 compatibility

Browse source
This commit is contained in:
Jan Tojnar 2017-11-03 22:48:50 +01:00
parent 8f8de4a34b
commit 716a0d6c19
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/desktops/gnome-3/core/mutter/default.nix
View file

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo { fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
, libgudev, libwacom, xwayland }: , libgudev, libwacom, xwayland, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
libXtst libXtst
]; ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = with gnome3; buildInputs = with gnome3;
[ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower [ pkgconfig intltool 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 libcanberra_gtk2
@ -23,6 +25,15 @@ stdenv.mkDerivation rec {
libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
libxkbcommon ]; libxkbcommon ];
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=760670
(fetchpatch {
name = "libgudev-232.patch";
url = https://bugzilla.gnome.org/attachment.cgi?id=358904;
sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";
})
];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/mutter" \ wrapProgram "$out/bin/mutter" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"