gnome3.gnome-shell: Format with nixpkgs-fmt

Also reorder and stop using aliases for pkg-config and docbook-xsl-{,no}ns.
This commit is contained in:
Jan Tojnar 2020-07-13 09:19:53 +02:00
parent 8d05772134
commit 8cddeef571
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,21 +1,74 @@
{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, gettext, libsecret
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
, libpulseaudio, libical, gobject-introspection, wrapGAppsHook, libxslt, gcr
, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop
, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
, gnome-autoar, asciidoc-full
{ fetchurl
, fetchpatch
, substituteAll
, stdenv
, meson
, ninja
, pkg-config
, gnome3
, json-glib
, gettext
, libsecret
, python3
, libsoup
, polkit
, clutter
, networkmanager
, docbook-xsl-nons
, docbook-xsl-ns
, at-spi2-core
, libstartup_notification
, telepathy-glib
, telepathy-logger
, libXtst
, unzip
, glibcLocales
, shared-mime-info
, libgweather
, libcanberra-gtk3
, librsvg
, geoclue2
, perl
, docbook_xml_dtd_42
, desktop-file-utils
, libpulseaudio
, libical
, gobject-introspection
, wrapGAppsHook
, libxslt
, gcr
, accountsservice
, gdk-pixbuf
, gdm
, upower
, ibus
, libnma
, libgnomekbd
, gnome-desktop
, gsettings-desktop-schemas
, gnome-keyring
, glib
, gjs
, mutter
, evolution-data-server
, gtk3
, sassc
, systemd
, gst_all_1
, adwaita-icon-theme
, gnome-bluetooth
, gnome-clocks
, gnome-settings-daemon
, gnome-autoar
, asciidoc-full
, bash-completion
}:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
let
pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]);
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "3.36.4";
@ -24,37 +77,6 @@ in stdenv.mkDerivation rec {
sha256 = "1nyibrr98ijn65z9ki0k7xzcwcliwy2jqssz0l0jalpbkhnr751d";
};
LANG = "en_US.UTF-8";
nativeBuildInputs = [
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
sassc desktop-file-utils libxslt.bin python3 asciidoc-full
];
buildInputs = [
systemd
gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
libsecret libsoup polkit gdk-pixbuf librsvg
networkmanager libstartup_notification telepathy-glib
libXtst gjs mutter libpulseaudio evolution-data-server
libical gtk3 gdm libcanberra-gtk3 geoclue2
adwaita-icon-theme gnome-bluetooth
gnome-clocks # schemas needed
at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
gobject-introspection
gnome-autoar
# recording
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
# not declared at build time, but typelib is needed at runtime
libgweather libnma
# for gnome-extension tool
bash-completion
];
patches = [
# Hardcode paths to various dependencies so that they can be found at runtime.
(substituteAll {
@ -86,6 +108,77 @@ in stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
docbook-xsl-nons
docbook-xsl-ns
docbook_xml_dtd_42
perl
wrapGAppsHook
glibcLocales
sassc
desktop-file-utils
libxslt.bin
python3
asciidoc-full
];
buildInputs = [
systemd
gsettings-desktop-schemas
gnome-keyring
glib
gcr
json-glib
accountsservice
libsecret
libsoup
polkit
gdk-pixbuf
librsvg
networkmanager
libstartup_notification
telepathy-glib
libXtst
gjs
mutter
libpulseaudio
evolution-data-server
libical
gtk3
gdm
libcanberra-gtk3
geoclue2
adwaita-icon-theme
gnome-bluetooth
gnome-clocks # schemas needed
at-spi2-core
upower
ibus
gnome-desktop
telepathy-logger
gnome-settings-daemon
gobject-introspection
gnome-autoar
# recording
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
# not declared at build time, but typelib is needed at runtime
libgweather
libnma
# for gnome-extension tool
bash-completion
];
LANG = "en_US.UTF-8";
postPatch = ''
patchShebangs src/data-to-c.pl
chmod +x meson/postinstall.py