69698ec11c
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
37 lines
1.2 KiB
Nix
37 lines
1.2 KiB
Nix
{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
|
|
, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
|
|
|
|
stdenv.mkDerivation rec {
|
|
inherit (import ./src.nix fetchurl) name src;
|
|
|
|
configureFlags = "--enable-systemd";
|
|
|
|
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
|
|
];
|
|
|
|
# FIXME: glib binaries shouldn't be in .dev!
|
|
preFixup = ''
|
|
for desktopFile in $(grep -rl "Exec=gnome-session" $out/share)
|
|
do
|
|
echo "Patching gnome-session path in: $desktopFile"
|
|
sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile
|
|
done
|
|
wrapProgram "$out/bin/gnome-session" \
|
|
--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_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg"
|
|
'';
|
|
|
|
meta = with stdenv.lib; {
|
|
platforms = platforms.linux;
|
|
maintainers = gnome3.maintainers;
|
|
};
|
|
|
|
}
|