public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-session: fix build

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-15 13:24:46 +01:00
parent df37e9cf0e
commit c5c34f37f9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/desktops/gnome-3/core/gnome-session/default.nix
View File

@ -1,5 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower { fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-session-${version}"; name = "gnome-session-${version}";
@ -10,18 +11,23 @@ stdenv.mkDerivation rec {
sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b"; sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b";
}; };
passthru = { mesonFlags = [ "-Dsystemd=true" ];
updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; };
};
configureFlags = "--enable-systemd"; nativeBuildInputs = [
meson ninja pkgconfig gettext makeWrapper
xmlto libxslt docbook_xsl docbook_xml_dtd_412
dbus # for DTD
];
buildInputs = with gnome3; buildInputs = [
[ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
gsettings-desktop-schemas upower intltool gconf makeWrapper systemd ];
epoxy
]; postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
# FIXME: glib binaries shouldn't be in .dev! # FIXME: glib binaries shouldn't be in .dev!
preFixup = '' preFixup = ''
@ -34,13 +40,22 @@ stdenv.mkDerivation rec {
--prefix PATH : "${glib.dev}/bin" \ --prefix PATH : "${glib.dev}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \ --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\
--suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"
''; '';
meta = with stdenv.lib; { passthru = {
platforms = platforms.linux; updateScript = gnome3.updateScript {
maintainers = gnome3.maintainers; packageName = "gnome-session";
attrPath = "gnome3.gnome-session";
};
}; };
meta = with stdenv.lib; {
description = "GNOME session manager";
homepage = https://wiki.gnome.org/Projects/SessionManagement;
license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
} }