diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-15 13:24:46 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:54 +0100 |
| commit | c5c34f37f97d9bd70eb250c027bf825d22f77012 (patch) | |
| tree | cf22f58f8570e5bd73c64236cdfc3d6e48b59a79 /pkgs/desktops/gnome-3/core | |
| parent | df37e9cf0e16577238f6ecb0db3f6048c9d888d0 (diff) | |
| download | nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.tar nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.tar.gz nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.tar.bz2 nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.tar.lz nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.tar.xz nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.tar.zst nixpkgs-c5c34f37f97d9bd70eb250c027bf825d22f77012.zip | |
gnome3.gnome-session: fix build
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-session/default.nix | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index c5e56b0796f..d36e7ce7432 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412 +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { name = "gnome-session-${version}"; @@ -10,18 +11,23 @@ stdenv.mkDerivation rec { sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; }; - }; + mesonFlags = [ "-Dsystemd=true" ]; - configureFlags = "--enable-systemd"; + nativeBuildInputs = [ + meson ninja pkgconfig gettext makeWrapper + xmlto libxslt docbook_xsl docbook_xml_dtd_412 + dbus # for DTD + ]; - buildInputs = with gnome3; - [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt - gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme - gsettings-desktop-schemas upower intltool gconf makeWrapper systemd - epoxy - ]; + buildInputs = [ + glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + gnome3.gnome-settings-daemon gsettings-desktop-schemas 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! preFixup = '' @@ -34,13 +40,22 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_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" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-session"; + attrPath = "gnome3.gnome-session"; + }; + }; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "GNOME session manager"; + homepage = https://wiki.gnome.org/Projects/SessionManagement; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } |