summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@riseup.net>2018-06-18 23:32:55 +0300
committerGitHub <noreply@github.com>2018-06-18 23:32:55 +0300
commit5dc13ed46b23f2bac23584272482bfdbabe5452b (patch)
treebddd7bc7e9d0dacadd84257d17325fd0003f432a
parentgnome-session: remove wrapProgram (diff)
downloadnixpkgs-origin/yegortimoshenko-patch-7.tar.gz
gnome-session: sort build inputs, remove makeWrapperorigin/yegortimoshenko-patch-7
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-session/default.nix26
1 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index c7f4ac462df4..030414ff6241 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -14,14 +14,30 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Dsystemd=true" ];
nativeBuildInputs = [
- meson ninja pkgconfig gettext makeWrapper
- xmlto libxslt docbook_xsl docbook_xml_dtd_412
- wrapGAppsHook dbus # for DTD
+ dbus # for DTD
+ docbook_xml_dtd_412
+ docbook_xsl
+ gettext
+ libxslt
+ meson
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ xmlto
];
buildInputs = [
- glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
- gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
+ epoxy
+ glib
+ gnome-desktop
+ gnome3.defaultIconTheme
+ gnome3.gnome-settings-daemon
+ gsettings-desktop-schemas
+ gtk
+ json-glib
+ libICE
+ systemd
+ xorg.xtrans
];
postPatch = ''