mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
Jan Tojnar
GitHub
commit
4655669483
@ -299,10 +299,11 @@
|
||||
./services/desktops/gnome3/chrome-gnome-shell.nix
|
||||
./services/desktops/gnome3/evolution-data-server.nix
|
||||
./services/desktops/gnome3/glib-networking.nix
|
||||
./services/desktops/gnome3/gnome-initial-setup.nix
|
||||
./services/desktops/gnome3/gnome-keyring.nix
|
||||
./services/desktops/gnome3/gnome-online-accounts.nix
|
||||
./services/desktops/gnome3/gnome-remote-desktop.nix
|
||||
./services/desktops/gnome3/gnome-online-miners.nix
|
||||
./services/desktops/gnome3/gnome-remote-desktop.nix
|
||||
./services/desktops/gnome3/gnome-settings-daemon.nix
|
||||
./services/desktops/gnome3/gnome-user-share.nix
|
||||
./services/desktops/gnome3/rygel.nix
|
||||
|
||||
@ -0,0 +1,86 @@
|
||||
# GNOME Initial Setup.
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
# GNOME initial setup's run is conditioned on whether
|
||||
# the gnome-initial-setup-done file exists in XDG_CONFIG_HOME
|
||||
# Because of this, every existing user will have initial setup
|
||||
# running because they never ran it before.
|
||||
#
|
||||
# To prevent this we create the file if the users stateVersion
|
||||
# is older than 20.03 (the release we added this module).
|
||||
|
||||
script = pkgs.writeScript "create-gis-stamp-files" ''
|
||||
#!${pkgs.runtimeShell}
|
||||
setup_done=$HOME/.config/gnome-initial-setup-done
|
||||
|
||||
echo "Creating g-i-s stamp file $setup_done ..."
|
||||
cat - > $setup_done <<- EOF
|
||||
yes
|
||||
EOF
|
||||
'';
|
||||
|
||||
createGisStampFilesAutostart = pkgs.writeTextFile rec {
|
||||
name = "create-g-i-s-stamp-files";
|
||||
destination = "/etc/xdg/autostart/${name}.desktop";
|
||||
text = ''
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Create GNOME Initial Setup stamp files
|
||||
Exec=${script}
|
||||
StartupNotify=false
|
||||
NoDisplay=true
|
||||
OnlyShowIn=GNOME;
|
||||
AutostartCondition=unless-exists gnome-initial-setup-done
|
||||
X-GNOME-Autostart-Phase=EarlyInitialization
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.gnome3.gnome-initial-setup = {
|
||||
|
||||
enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.gnome3.gnome-initial-setup.enable {
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.gnome3.gnome-initial-setup
|
||||
]
|
||||
++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
|
||||
;
|
||||
|
||||
systemd.packages = [
|
||||
pkgs.gnome3.gnome-initial-setup
|
||||
];
|
||||
|
||||
systemd.user.targets."gnome-session".wants = [
|
||||
"gnome-initial-setup-copy-worker.service"
|
||||
"gnome-initial-setup-first-login.service"
|
||||
"gnome-welcome-tour.service"
|
||||
];
|
||||
|
||||
systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
|
||||
"gnome-initial-setup.service"
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -155,10 +155,10 @@ in
|
||||
|
||||
environment.systemPackages = cfg.sessionPath;
|
||||
|
||||
environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
|
||||
# Override GSettings schemas
|
||||
environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
|
||||
|
||||
# If gnome3 is installed, build vim for gtk3 too.
|
||||
nixpkgs.config.vim.gui = "gtk3";
|
||||
@ -229,6 +229,7 @@ in
|
||||
services.colord.enable = mkDefault true;
|
||||
services.gnome3.chrome-gnome-shell.enable = mkDefault true;
|
||||
services.gnome3.glib-networking.enable = true;
|
||||
services.gnome3.gnome-initial-setup.enable = mkDefault true;
|
||||
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
|
||||
services.gnome3.gnome-settings-daemon.enable = true;
|
||||
services.gnome3.gnome-user-share.enable = mkDefault true;
|
||||
@ -236,7 +237,23 @@ in
|
||||
services.gvfs.enable = true;
|
||||
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
|
||||
services.telepathy.enable = mkDefault true;
|
||||
systemd.packages = [ pkgs.gnome3.vino ];
|
||||
|
||||
systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ];
|
||||
|
||||
# gnome-settings-daemon.nix is shared between several desktop
|
||||
# environments (eg. mate and pantheon) so specify these gnome-shell specific
|
||||
# service dependencies here instead.
|
||||
systemd.user.targets."gnome-session-initialized".wants = [
|
||||
"gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target"
|
||||
"gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target"
|
||||
"gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target"
|
||||
"gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target"
|
||||
"gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target"
|
||||
];
|
||||
|
||||
systemd.user.targets."gnome-session-x11-services".wants = [
|
||||
"gsd-xsettings.target"
|
||||
];
|
||||
|
||||
services.avahi.enable = mkDefault true;
|
||||
|
||||
@ -329,10 +346,10 @@ in
|
||||
|
||||
# Let nautilus find extensions
|
||||
# TODO: Create nautilus-with-extensions package
|
||||
environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
|
||||
environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
|
||||
|
||||
# Override default mimeapps for nautilus
|
||||
environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
|
||||
environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/share/nautilus-python/extensions"
|
||||
|
||||
@ -150,6 +150,11 @@ in
|
||||
mkdir -p /run/gdm/.config/pulse
|
||||
ln -sf ${pulseConfig} /run/gdm/.config/pulse/default.pa
|
||||
chown -R gdm:gdm /run/gdm/.config
|
||||
'' + optionalString config.services.gnome3.gnome-initial-setup.enable ''
|
||||
# Create stamp file for gnome-initial-setup to prevent run.
|
||||
cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
|
||||
yes
|
||||
EOF
|
||||
'';
|
||||
};
|
||||
|
||||
@ -159,6 +164,10 @@ in
|
||||
"rc-local.service"
|
||||
"systemd-machined.service"
|
||||
"systemd-user-sessions.service"
|
||||
"getty@tty1.service"
|
||||
];
|
||||
systemd.services.display-manager.conflicts = [
|
||||
"getty@tty1.service"
|
||||
];
|
||||
|
||||
systemd.services.display-manager.serviceConfig = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ gcc8Stdenv
|
||||
{ stdenv
|
||||
, ctags
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
@ -23,6 +23,7 @@
|
||||
, ninja
|
||||
, ostree
|
||||
, pcre
|
||||
, pcre2
|
||||
, pkgconfig
|
||||
, python3
|
||||
, sysprof
|
||||
@ -33,20 +34,16 @@
|
||||
, wrapGAppsHook
|
||||
, dbus
|
||||
, xvfb_run
|
||||
, glib
|
||||
}:
|
||||
|
||||
let
|
||||
# Does not build with GCC 7
|
||||
# https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
|
||||
stdenv = gcc8Stdenv;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-builder";
|
||||
version = "3.32.4";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr";
|
||||
sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -82,6 +79,7 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
ostree
|
||||
pcre
|
||||
pcre2
|
||||
python3
|
||||
sysprof
|
||||
template-glib
|
||||
@ -100,6 +98,8 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
mesonFlags = [
|
||||
"-Dpython_libprefix=${python3.libPrefix}"
|
||||
"-Ddocs=true"
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
|
||||
{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
|
||||
, fetchpatch }:
|
||||
|
||||
let
|
||||
version = "2.3.1";
|
||||
@ -14,6 +15,14 @@ in stdenv.mkDerivation {
|
||||
sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove useage of deprecrated G_PARAM_PRIVATE
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
|
||||
sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gtk3 hicolor-icon-theme ];
|
||||
|
||||
@ -35,13 +35,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-photos";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn";
|
||||
sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
76
pkgs/applications/misc/gnome-firmware-updater/default.nix
Normal file
76
pkgs/applications/misc/gnome-firmware-updater/default.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, fwupd
|
||||
, gettext
|
||||
, glib
|
||||
, gnome3
|
||||
, gtk3
|
||||
, libsoup
|
||||
, libxmlb
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, systemd
|
||||
, help2man
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-firmware-updater";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "hughsie";
|
||||
repo = "gnome-firmware-updater";
|
||||
rev = version;
|
||||
sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes manual build
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
|
||||
sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
|
||||
sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib # for ITS rules
|
||||
desktop-file-utils
|
||||
gettext
|
||||
help2man
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fwupd
|
||||
glib
|
||||
gtk3
|
||||
libsoup
|
||||
libxmlb
|
||||
systemd
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dconsolekit=false"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater";
|
||||
description = "Tool for installing firmware on devices";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = gnome3.maintainers;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -13,15 +13,16 @@
|
||||
, libgtop
|
||||
, libdazzle
|
||||
, gnome3
|
||||
, tracker
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-usage";
|
||||
version = "3.32.0";
|
||||
version = "3.33.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih";
|
||||
sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
libdazzle
|
||||
libgtop
|
||||
tracker
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, pkgconfig, fetchurl, buildPythonApplication
|
||||
, autoreconfHook, wrapGAppsHook, gobject-introspection
|
||||
, intltool, yelp-tools, itstool, libxmlxx3
|
||||
, gettext, yelp-tools, itstool, libxmlxx3
|
||||
, python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme
|
||||
, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
|
||||
, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i";
|
||||
sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -30,7 +30,7 @@ buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
|
||||
intltool yelp-tools itstool gobject-introspection
|
||||
gettext yelp-tools itstool gobject-introspection
|
||||
hicolor-icon-theme # setup-hook
|
||||
];
|
||||
|
||||
@ -45,11 +45,6 @@ buildPythonApplication rec {
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
# Run intltoolize to create po/Makefile.in.in
|
||||
preConfigure = ''
|
||||
intltoolize
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
|
||||
, glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs
|
||||
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre
|
||||
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
|
||||
, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
|
||||
}:
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ];
|
||||
|
||||
buildInputs =
|
||||
[ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp
|
||||
[ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
|
||||
utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux
|
||||
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sakura";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkgconfig ];
|
||||
|
||||
buildInputs = [ makeWrapper gtk3 vte pcre glib ];
|
||||
buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
|
||||
|
||||
# Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
|
||||
postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "stupidterm";
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ vte gtk ];
|
||||
buildInputs = [ vte gtk pcre2 ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esmil";
|
||||
|
||||
@ -1,6 +1,40 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
|
||||
# termite requires VTE with some internals exposed
|
||||
# https://github.com/thestinger/vte-ng
|
||||
vte-ng = vte.overrideAttrs (attrs: {
|
||||
patches = attrs.patches or [] ++ [
|
||||
(fetchpatch {
|
||||
name = "0001-expose-functions-for-pausing-unpausing-output.patch";
|
||||
url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
|
||||
sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-expose-function-for-setting-cursor-position.patch";
|
||||
url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch";
|
||||
sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0003-add-function-for-setting-the-text-selections.patch";
|
||||
url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch";
|
||||
sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0004-add-functions-to-get-set-block-selection-mode.patch";
|
||||
url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
|
||||
sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0005-expose-function-for-getting-the-selected-text.patch";
|
||||
url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
|
||||
sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "termite";
|
||||
version = "15";
|
||||
|
||||
@ -24,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
|
||||
|
||||
buildInputs = [ vte-ng gtk3 ncurses ];
|
||||
buildInputs = [ vte-ng gtk3 ncurses pcre2 ];
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
|
||||
|
||||
|
||||
@ -1,24 +1,52 @@
|
||||
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
|
||||
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, intltool
|
||||
, vala_0_44
|
||||
, wrapGAppsHook
|
||||
, gcr
|
||||
, libpeas
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, sqlite
|
||||
, gsettings-desktop-schemas
|
||||
, libsoup
|
||||
, glib-networking
|
||||
, json-glib
|
||||
, libarchive
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "midori";
|
||||
version = "7";
|
||||
version = "9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz";
|
||||
sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh";
|
||||
url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz";
|
||||
sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig cmake ninja intltool vala wrapGAppsHook
|
||||
cmake
|
||||
intltool
|
||||
ninja
|
||||
pkgconfig
|
||||
vala_0_44
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
|
||||
(libsoup.override { gnomeSupport = true; }) libpeas
|
||||
(libsoup.override { gnomeSupport = true; })
|
||||
gcr
|
||||
glib-networking
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
libpeas
|
||||
sqlite
|
||||
webkitgtk
|
||||
json-glib
|
||||
libarchive
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
|
||||
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
|
||||
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch
|
||||
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme
|
||||
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
|
||||
}:
|
||||
@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fixes build with libsecret
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch";
|
||||
sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A modern desktop application designed to complement existing web-based RSS accounts";
|
||||
homepage = https://jangernert.github.io/FeedReader/;
|
||||
|
||||
@ -13,6 +13,9 @@ stdenv.mkDerivation {
|
||||
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
|
||||
};
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
|
||||
|
||||
|
||||
@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ pidgin gmime libxml2 nss ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
|
||||
postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
|
||||
};
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
|
||||
perl mkfiles.pl
|
||||
( cd doc ; make );
|
||||
|
||||
@ -43,9 +43,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedUserEnvPkgs = [ dconf ];
|
||||
|
||||
# glib-2.58 deprecrated g_type_class_add_private
|
||||
# Should probably be removed next version bump
|
||||
CXXFLAGS = [ "-Wno-deprecated-declarations" ];
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
|
||||
patches = [ ./cmake_check_symbol_exists.patch ];
|
||||
|
||||
|
||||
@ -45,6 +45,9 @@ in stdenv.mkDerivation {
|
||||
python2.pkgs.pygtk
|
||||
];
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
|
||||
preConfigure = ''./autogen.sh'';
|
||||
configureFlags = [
|
||||
"--enable-python"
|
||||
|
||||
@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl";
|
||||
};
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
|
||||
buildInputs = [ glib pkgconfig gtk2 hamlib ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
|
||||
gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
|
||||
libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
|
||||
libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
|
||||
libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
|
||||
libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
vte
|
||||
wnck
|
||||
gnutls
|
||||
pcre2
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -39,7 +39,7 @@ let
|
||||
deepin-turbo = callPackage ./deepin-turbo { };
|
||||
deepin-wallpapers = callPackage ./deepin-wallpapers { };
|
||||
deepin-wm = callPackage ./deepin-wm {
|
||||
vala = pkgs.vala_0_42;
|
||||
vala = pkgs.vala_0_40;
|
||||
};
|
||||
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
|
||||
dtkcore = callPackage ./dtkcore { };
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
name = "accerciser-${version}";
|
||||
version = "3.32.3";
|
||||
version = "3.34.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0ark4qkfvdggz2mbksq12iq55izdsjnkjqkvfnnkf4k5vfpa95y5";
|
||||
sha256 = "1npl1pxqrij9dsmp70ralcfbjbw503jsz2pqm3qjwyba5cf6kcbm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,39 +1,41 @@
|
||||
{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
|
||||
{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3
|
||||
, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
|
||||
, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
|
||||
, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
|
||||
, libxslt, yelp-tools, gnome-common, gtk-doc
|
||||
, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
|
||||
, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2
|
||||
, meson, ninja, dbus, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cheese";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv";
|
||||
sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; };
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib
|
||||
meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib
|
||||
libxslt docbook_xml_dtd_43 docbook_xsl
|
||||
autoreconfHook gtk-doc yelp-tools gnome-common
|
||||
gtk-doc yelp-tools gnome-common python3
|
||||
];
|
||||
buildInputs = [ gtk3 glib gnome-video-effects
|
||||
gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
|
||||
gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
|
||||
libcanberra-gtk3 libgudev ];
|
||||
libcanberra-gtk3 libgudev dbus ];
|
||||
|
||||
outputs = [ "out" "man" "devdoc" ];
|
||||
|
||||
patches = [
|
||||
gtk-doc.respect_xml_catalog_files_var_patch
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# Effects
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, gtk3
|
||||
, glib
|
||||
, libnotify
|
||||
, gtkspell3
|
||||
, gspell
|
||||
, evolution-data-server
|
||||
, adwaita-icon-theme
|
||||
, gnome-desktop
|
||||
@ -38,15 +38,16 @@
|
||||
, procps
|
||||
, p11-kit
|
||||
, openldap
|
||||
, spamassassin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.32.4";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh";
|
||||
sha256 = "136jim297ac7ig0ax7ll6x4dc3vhd7l5prh3fvb4mmskv5klbl6r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
gtk3
|
||||
gtkspell3
|
||||
gspell
|
||||
highlight
|
||||
icu
|
||||
libcanberra-gtk3
|
||||
@ -102,6 +103,10 @@ stdenv.mkDerivation rec {
|
||||
"-DENABLE_LIBCRYPTUI=OFF"
|
||||
"-DENABLE_PST_IMPORT=OFF"
|
||||
"-DENABLE_YTNEF=OFF"
|
||||
"-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin"
|
||||
"-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"
|
||||
"-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter"
|
||||
"-DWITH_OPENLDAP=${openldap}"
|
||||
];
|
||||
|
||||
requiredSystemFeatures = [
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "file-roller";
|
||||
version = "3.32.1";
|
||||
version = "3.32.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw";
|
||||
sha256 = "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6";
|
||||
};
|
||||
|
||||
LANG = "en_US.UTF-8"; # postinstall.py
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gedit";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
|
||||
sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-books";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4";
|
||||
sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,17 +6,15 @@
|
||||
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
|
||||
}:
|
||||
|
||||
# TODO: ovirt (optional)
|
||||
|
||||
let
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
|
||||
sha256 = "07qjrb1qgfznvm0l2jm99d212dvw3iaw76czq5q1msnghpdw67qd";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
@ -40,10 +38,6 @@ in stdenv.mkDerivation rec {
|
||||
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}")
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dovirt=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/post_install.py # patchShebangs requires executable file
|
||||
patchShebangs build-aux/post_install.py
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "gnome-calendar";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k";
|
||||
sha256 = "0gbiqsx3pny2blgfwazy82fbrnn17yilm3rvv1aq8k5w0xd9147b";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-clocks";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
|
||||
sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-documents";
|
||||
version = "3.32.0";
|
||||
version = "3.33.90";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
|
||||
sha256 = "0l9g10i380bnjp1y3pslsy8ph1hd5x1d57dadvq70p5ki4r3qjaw";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-getting-started-docs";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq";
|
||||
sha256 = "1nq3dvvjr6vzl87p0y2ggv8bxap3hdbwhbn9ycan4y5d4g5f437p";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,23 +1,22 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook
|
||||
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-logs";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068";
|
||||
sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtests=true"
|
||||
"-Dman=true"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
|
||||
meson ninja pkgconfig wrapGAppsHook gettext itstool
|
||||
libxml2 libxslt docbook_xsl docbook_xml_dtd_43
|
||||
];
|
||||
buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
let
|
||||
pname = "gnome-maps";
|
||||
version = "3.32.2.1";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb";
|
||||
sha256 = "0vsi21zzk5mvf6rv86r6ahzxd93ciyhjrdqsn3pncnk0yy67y2wr";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk";
|
||||
sha256 = "1a566ifx08clfm22qzdh1i6w8cr2kv7avqzkk6zgc5adba0vmzx4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
, gnome3, libxml2, gsettings-desktop-schemas, tracker }:
|
||||
|
||||
let
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "gnome-notes";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
|
||||
sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2";
|
||||
sha256 = "0wrnsspcg4s0vdfc23cc84xy02k3b19yim9s4k0vv23b69n37n1l";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sound-recorder";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0q83b6dabckmwj8mcw0wvhbxaszwdzzcf8ajx5bldll3lyl5yh2b";
|
||||
sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with e-d-s 3.32
|
||||
# fix build with libecal 2.0
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch;
|
||||
sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
|
||||
name = "gnome-todo-eds-libecal-2.0.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch";
|
||||
sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-weather";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s";
|
||||
sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
|
||||
|
||||
let
|
||||
pname = "nautilus-sendto";
|
||||
version = "3.8.6";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz";
|
||||
sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Integrates Evolution and Pidgin into the Nautilus file manager";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
let
|
||||
pname = "polari";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp";
|
||||
sha256 = "09g2ylx2fwm55h28w0c03fxkdvlwmr2yc033m93c4acz1h30rjns";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, vala, meson, ninja, libpwquality
|
||||
{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality
|
||||
, pkgconfig, gtk3, glib, gobject-introspection
|
||||
, wrapGAppsHook, itstool, gnupg, libsoup
|
||||
, gnome3, gpgme, python3, openldap, gcr
|
||||
@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with recent libsecret
|
||||
# https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch;
|
||||
sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adwaita-icon-theme";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
|
||||
sha256 = "0zvwikj3a07i3g3rir4cc63b14822lrzzgprs1j2nmb3h8gykds0";
|
||||
};
|
||||
|
||||
# For convenience, we can specify adwaita-icon-theme only in packages
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "baobab";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r";
|
||||
sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
let
|
||||
pname = "dconf-editor";
|
||||
version = "3.32.0";
|
||||
version = "3.34.1";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi";
|
||||
sha256 = "0dgkgzrk4q8753j3lvz4ykyfs7pv1fvdmi516ryv3q20k24kxb9j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,20 +6,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "0.32.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38";
|
||||
sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix the build on Darwin
|
||||
# Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
|
||||
sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "eog";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy";
|
||||
sha256 = "1vjrlgc82ij8ijkgc1ssssig4bp23nd6a31wx44m7k1pwy64z594";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
|
||||
|
||||
@ -1,32 +1,90 @@
|
||||
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
|
||||
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
|
||||
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
|
||||
, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle
|
||||
, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
|
||||
{ stdenv
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, gtk3
|
||||
, glib
|
||||
, icu
|
||||
, wrapGAppsHook
|
||||
, gnome3
|
||||
, libxml2
|
||||
, libxslt
|
||||
, itstool
|
||||
, webkitgtk
|
||||
, libsoup
|
||||
, glib-networking
|
||||
, libsecret
|
||||
, gnome-desktop
|
||||
, libnotify
|
||||
, p11-kit
|
||||
, sqlite
|
||||
, gcr
|
||||
, isocodes
|
||||
, desktop-file-utils
|
||||
, python3
|
||||
, nettle
|
||||
, gdk-pixbuf
|
||||
, gst_all_1
|
||||
, json-glib
|
||||
, libdazzle
|
||||
, libhandy
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "3.32.4";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
|
||||
sha256 = "04wxnz8i0wbg21lqll2gqaa5j17f4vxqzgwgc7b0nylqi9pyd8bb";
|
||||
};
|
||||
|
||||
# Tests need an X display
|
||||
mesonFlags = [ "-Dunit_tests=disabled" ];
|
||||
mesonFlags = [
|
||||
"-Dunit_tests=disabled"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
|
||||
desktop-file-utils
|
||||
gettext
|
||||
itstool
|
||||
libxslt
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
|
||||
sqlite isocodes p11-kit icu libhandy
|
||||
gdk-pixbuf gnome3.adwaita-icon-theme gcr
|
||||
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-libav json-glib libdazzle nettle
|
||||
gcr
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glib-networking
|
||||
gnome-desktop
|
||||
gnome3.adwaita-icon-theme
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gstreamer
|
||||
gtk3
|
||||
icu
|
||||
isocodes
|
||||
json-glib
|
||||
libdazzle
|
||||
libhandy
|
||||
libnotify
|
||||
libsecret
|
||||
libsoup
|
||||
libxml2
|
||||
nettle
|
||||
p11-kit
|
||||
sqlite
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -36,7 +94,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "epiphany";
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ fetchFromGitLab
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
@ -34,6 +33,9 @@
|
||||
, texlive
|
||||
, t1lib
|
||||
, gst_all_1
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, supportMultimedia ? true # PDF multimedia
|
||||
, libgxps
|
||||
, supportXPS ? true # Open XML Paper Specification via libgxps
|
||||
@ -41,64 +43,62 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evince";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
# meson.build not distributed
|
||||
# See: https://gitlab.gnome.org/GNOME/evince/issues/1270
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r";
|
||||
sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr";
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2019-11459.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch";
|
||||
sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
gettext
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
gobject-introspection
|
||||
gettext
|
||||
itstool
|
||||
yelp-tools
|
||||
appstream
|
||||
wrapGAppsHook
|
||||
python3
|
||||
wrapGAppsHook
|
||||
yelp-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
pango
|
||||
atk
|
||||
gdk-pixbuf
|
||||
libxml2
|
||||
gsettings-desktop-schemas
|
||||
poppler
|
||||
ghostscriptX
|
||||
djvulibre
|
||||
libspectre
|
||||
libarchive
|
||||
libsecret
|
||||
librsvg
|
||||
adwaita-icon-theme
|
||||
gspell
|
||||
gnome-desktop
|
||||
atk
|
||||
dbus # only needed to find the service directory
|
||||
texlive.bin.core # kpathsea for DVI support
|
||||
djvulibre
|
||||
gdk-pixbuf
|
||||
ghostscriptX
|
||||
glib
|
||||
gnome-desktop
|
||||
gsettings-desktop-schemas
|
||||
gspell
|
||||
gtk3
|
||||
libarchive
|
||||
librsvg
|
||||
libsecret
|
||||
libspectre
|
||||
libxml2
|
||||
pango
|
||||
poppler
|
||||
t1lib
|
||||
texlive.bin.core # kpathsea for DVI support
|
||||
] ++ stdenv.lib.optional supportXPS libgxps
|
||||
++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
|
||||
@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
|
||||
mesonFlags = [
|
||||
"-Dnautilus=false"
|
||||
"-Dps=enabled"
|
||||
"-Dgtk_doc=false"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.32.4";
|
||||
version = "3.34.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
|
||||
sha256 = "1kw6wkrr33bxv95z06dr31qvmp7c7x88xkw27k3fq0df4jlb17gv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,15 +1,29 @@
|
||||
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
|
||||
, accountsservice, libX11, gnome3, systemd, autoreconfHook
|
||||
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
|
||||
, librsvg, coreutils, xwayland }:
|
||||
, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
|
||||
|
||||
let
|
||||
|
||||
icon = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/4f041870efa1a6f0799ef4b32bb7be2cafee7a74/logo/nixos.svg";
|
||||
sha256 = "0b0dj408c1wxmzy6k0pjwc4bzwq286f1334s3cqqwdwjshxskshk";
|
||||
};
|
||||
|
||||
override = substituteAll {
|
||||
src = ./org.gnome.login-screen.gschema.override;
|
||||
inherit icon;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdm";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
|
||||
sha256 = "0pnh0nj4kk8n48kgj77bb5r4z5jnb7kxnvpnddk6b9n96g0qwklv";
|
||||
};
|
||||
|
||||
# Only needed to make it build
|
||||
@ -22,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
"--localstatedir=/var"
|
||||
"--with-plymouth=yes"
|
||||
"--enable-gdm-xsession"
|
||||
"--with-initial-vt=7"
|
||||
# "--with-initial-vt=7"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
];
|
||||
@ -37,6 +51,18 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
# See: https://gitlab.gnome.org/GNOME/gdm/issues/515
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch";
|
||||
sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
|
||||
})
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gdm/merge_requests/84
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch";
|
||||
sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2";
|
||||
})
|
||||
|
||||
# Change hardcoded paths to nix store paths.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
@ -65,6 +91,11 @@ stdenv.mkDerivation rec {
|
||||
"dbusconfdir=$(out)/etc/dbus-1/system.d"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
schema_dir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
install -D ${override} $schema_dir/org.gnome.login-screen.gschema.override
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "gdm";
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
[org.gnome.login-screen]
|
||||
logo='@icon@'
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gjs";
|
||||
version = "1.56.2";
|
||||
version = "1.58.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
|
||||
sha256 = "1wvywpng27y0264pq9anxdi1xy280x6mcnbgiggn804pql4nml8y";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
buildInputs = [ libxml2 gobject-introspection gtk3 glib pango readline dbus ];
|
||||
buildInputs = [ libxml2 gobject-introspection glib pango readline dbus ];
|
||||
|
||||
propagatedBuildInputs = [ spidermonkey_60 ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-backgrounds";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
|
||||
sha256 = "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -6,14 +6,14 @@ let
|
||||
pname = "gnome-bluetooth";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
# TODO: split out "lib"
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4";
|
||||
sha256 = "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
|
||||
, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
|
||||
, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
|
||||
, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calculator";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
|
||||
sha256 = "0gzjdddby3pi22srlcw6q2dv9dxwak75jbplpvflhq4w82qx543b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib libxml2 gtksourceview4 mpfr gmp
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.adwaita-icon-theme libgee
|
||||
gsettings-desktop-schemas libsoup libmpc
|
||||
];
|
||||
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
, vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
version = "3.32.1";
|
||||
version = "3.34";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gnome-contacts";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy";
|
||||
sha256 = "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ evolution-data-server ];
|
||||
@ -33,15 +33,6 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fixes build with libhandy >= 0.0.10
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/c5eee38cd2556403a640a0a4c11d36cbf9a5a798.patch";
|
||||
sha256 = "0s2cl7z6b0x3ky4y28yyxc9x5zp4r3vqmvbhz5m2fm6830fyjg13";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/1f1500ca01098ffda6392f5ec9ce3a29a48a84b1.patch";
|
||||
sha256 = "082zaaj2l5cgr2qy145x8yknja87r0vpigrhidal40041kd5nldg";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -67,11 +67,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs";
|
||||
sha256 = "1jr3bbpycdzk26b83fsxw1my0aldi86v0733k42y4x45vacaanqa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
|
||||
sha256 = "09i4nv3fn8vlx7f1rzqid9qgd3srlz3hfajnjwmnpmf1apk1wcwd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
|
||||
, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
|
||||
, itstool, gnome3, libxml2, gsettings-desktop-schemas
|
||||
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
|
||||
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-disk-utility";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg";
|
||||
sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
|
||||
udisks2 gnome3.adwaita-icon-theme
|
||||
udisks2 gnome3.adwaita-icon-theme systemd
|
||||
gnome3.gnome-settings-daemon gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-font-viewer";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
|
||||
sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
115
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
Normal file
115
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
Normal file
@ -0,0 +1,115 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, wrapGAppsHook
|
||||
, gnome3
|
||||
, accountsservice
|
||||
, fontconfig
|
||||
, gdm
|
||||
, geoclue2
|
||||
, geocode-glib
|
||||
, glib
|
||||
, gnome-desktop
|
||||
, gnome-getting-started-docs
|
||||
, gnome-online-accounts
|
||||
, gtk3
|
||||
, libgweather
|
||||
, json-glib
|
||||
, krb5
|
||||
, libpwquality
|
||||
, librest
|
||||
, libsecret
|
||||
, networkmanager
|
||||
, pango
|
||||
, polkit
|
||||
, webkitgtk
|
||||
, systemd
|
||||
, networkmanagerapplet
|
||||
, tzdata
|
||||
, yelp
|
||||
, libgnomekbd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "19ly8xrj7vvjlhhbh6y2cm5l02qgq9wqfczrjdn0llkga9f8b8sc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
systemd
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
accountsservice
|
||||
fontconfig
|
||||
gdm
|
||||
geoclue2
|
||||
geocode-glib
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome-getting-started-docs
|
||||
gnome-online-accounts
|
||||
gtk3
|
||||
json-glib
|
||||
krb5
|
||||
libgweather
|
||||
libpwquality
|
||||
librest
|
||||
libsecret
|
||||
networkmanager
|
||||
pango
|
||||
polkit
|
||||
webkitgtk
|
||||
networkmanagerapplet
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Disable g-i-s service in GDM
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/commit/b67b5cc48c418415eb3233f78ab089bc447b1952.patch";
|
||||
sha256 = "050zc6cnil71bf7ijav6w6bkr33lqwglipcg7anw9jcn7mcakhlq";
|
||||
})
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit tzdata libgnomekbd;
|
||||
yelp = "${yelp}/bin/yelp"; # gnome-welcome-tour
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dregion-page=true"
|
||||
"-Dcheese=disabled"
|
||||
"-Dsoftware-sources=disabled"
|
||||
"-Dibus=disabled"
|
||||
"-Dvendor-conf-file=${./vendor.conf}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple, easy, and safe way to prepare a new system";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = gnome3.maintainers;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
|
||||
index c479296..3dd629c 100755
|
||||
--- a/data/gnome-welcome-tour
|
||||
+++ b/data/gnome-welcome-tour
|
||||
@@ -3,7 +3,7 @@
|
||||
cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
|
||||
|
||||
# Don't do anything if yelp isn't installed
|
||||
-yelp_path=$(which yelp 2>/dev/null)
|
||||
+yelp_path=@yelp@
|
||||
if test -z "${yelp_path}"; then
|
||||
rm -f $cfgdir/run-welcome-tour
|
||||
exit
|
||||
@@ -17,5 +17,5 @@ geometry=(1024, 709)
|
||||
EOF
|
||||
fi
|
||||
|
||||
-yelp help:gnome-help/getting-started
|
||||
+$yelp_path help:gnome-help/getting-started
|
||||
rm -f $cfgdir/run-welcome-tour
|
||||
diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
|
||||
index 1c34ef7..a1e7f93 100644
|
||||
--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
|
||||
+++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
|
||||
@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label,
|
||||
return TRUE;
|
||||
|
||||
if (variant[0])
|
||||
- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
|
||||
+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
|
||||
else
|
||||
- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout);
|
||||
+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout);
|
||||
g_spawn_command_line_async (commandline, NULL);
|
||||
g_free (commandline);
|
||||
|
||||
@@ -829,7 +829,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
|
||||
g_param_spec_string ("showing-extra", "", "", "",
|
||||
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
|
||||
|
||||
- signals[CHANGED] =
|
||||
+ signals[CHANGED] =
|
||||
g_signal_new ("changed",
|
||||
G_TYPE_FROM_CLASS (object_class),
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
|
||||
index 93905b3..e7ee785 100644
|
||||
--- a/gnome-initial-setup/pages/timezone/tz.h
|
||||
+++ b/gnome-initial-setup/pages/timezone/tz.h
|
||||
@@ -4,7 +4,7 @@
|
||||
* Copyright (C) 2000-2001 Ximian, Inc.
|
||||
*
|
||||
* Authors: Hans Petter Jansson <hpj@ximian.com>
|
||||
- *
|
||||
+ *
|
||||
* Largely based on Michael Fulbright's work on Anaconda.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <glib.h>
|
||||
|
||||
#ifndef __sun
|
||||
-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
|
||||
+# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
|
||||
#else
|
||||
# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
|
||||
#endif
|
||||
@ -0,0 +1,5 @@
|
||||
# Disable pages not right for NixOS
|
||||
# For example user accounts should be preconfigured
|
||||
# and we can't modify system time with systemd.
|
||||
[pages]
|
||||
skip=account;software;password;timezone;
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-keyring";
|
||||
version = "3.31.91";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
|
||||
sha256 = "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-online-miners";
|
||||
version = "3.30.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
|
||||
sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "gnome-screenshot";
|
||||
version = "3.32.0";
|
||||
version = "3.33.90";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b";
|
||||
sha256 = "0bki99lkp20jvp1yjymy8y56k378vivpvqvfwfx9dwl8r3qal7i2";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -1,17 +1,28 @@
|
||||
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
|
||||
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
|
||||
sha256 = "0qkdwvj6w33h8csq9mhjbf10f0v5g0sgabyfg1bgp75z0br76si0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix debug spam when using systemd session
|
||||
# https://gitlab.gnome.org/GNOME/gnome-session/issues/31
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/adfdf7f64f08fc07325f9332e9eba46974cc30ee.patch";
|
||||
sha256 = "0vjg77gpj3k63a5ffhsvv5m30lbj6cab35lhl4gpqxg4j2j3yy7y";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/b7b24627485c520f873db4e918e217a76ededd8c.patch";
|
||||
sha256 = "1d8pw8q423wvv0cd32p0yf52vlfj7w1if2gljqvarcm2n1m0pdxj";
|
||||
})
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
gsettings = "${glib.bin}/bin/gsettings";
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
, libwacom
|
||||
, libxslt
|
||||
, libxml2
|
||||
, modemmanager
|
||||
, networkmanager
|
||||
, gnome-desktop
|
||||
, geocode-glib
|
||||
@ -35,15 +36,16 @@
|
||||
, python3
|
||||
, tzdata
|
||||
, nss
|
||||
, gcr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks";
|
||||
sha256 = "0dvkq6pwrvqsm30wa965q0wf15v7nmnv6xfb9sli2sc62yc9gr3w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
modemmanager
|
||||
networkmanager
|
||||
libnotify
|
||||
libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
|
||||
@ -89,6 +92,7 @@ stdenv.mkDerivation rec {
|
||||
systemd
|
||||
libgudev
|
||||
libwacom
|
||||
gcr
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -13,14 +13,3 @@
|
||||
|
||||
typedef struct _TzDB TzDB;
|
||||
typedef struct _TzLocation TzLocation;
|
||||
--- a/plugins/mouse/gsd-mouse-manager.c
|
||||
+++ b/plugins/mouse/gsd-mouse-manager.c
|
||||
@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager,
|
||||
gboolean run_daemon = dwell_click_enabled || secondary_click_enabled;
|
||||
|
||||
if (run_daemon || manager->priv->mousetweaks_daemon_running)
|
||||
- comm = g_strdup_printf ("mousetweaks %s",
|
||||
+ comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s",
|
||||
run_daemon ? "" : "-s");
|
||||
else
|
||||
return;
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib
|
||||
{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_60, glib
|
||||
, gnome3, gnome-menus, substituteAll }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extensions";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2";
|
||||
sha256 = "1ayb48l2p3lji7b226027293jfclgcjmdb5dd6xfn67rhxm8zgzm";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "gnome-shell-extensions";
|
||||
attrPath = "gnome3.gnome-shell-extensions";
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# 52 is required for tests
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build#L25
|
||||
checkInputs = [ spidermonkey_52 ];
|
||||
# 60 is required for tests
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23
|
||||
checkInputs = [ spidermonkey_60 ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
|
||||
|
||||
|
||||
@ -2,10 +2,11 @@
|
||||
, 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, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
|
||||
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
|
||||
, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, 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 }:
|
||||
, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
|
||||
, gnome-autoar, asciidoc-full }:
|
||||
|
||||
# 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
|
||||
|
||||
@ -14,21 +15,21 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
|
||||
sha256 = "0vdx4mfj46cpvzn6mhxc1ivg138437f5m4n3k4vb54pk45w4s00x";
|
||||
};
|
||||
|
||||
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
|
||||
sassc desktop-file-utils libxslt.bin python3 asciidoc-full
|
||||
];
|
||||
buildInputs = [
|
||||
systemd caribou
|
||||
systemd
|
||||
gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
|
||||
libcroco libsecret libsoup polkit gdk-pixbuf librsvg
|
||||
clutter networkmanager libstartup_notification telepathy-glib
|
||||
@ -39,15 +40,11 @@ in stdenv.mkDerivation rec {
|
||||
at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
|
||||
gst_all_1.gst-plugins-good # recording
|
||||
gobject-introspection
|
||||
gnome-autoar
|
||||
|
||||
# not declared at build time, but typelib is needed at runtime
|
||||
libgweather networkmanagerapplet
|
||||
];
|
||||
propagatedUserEnvPkgs = [
|
||||
# Needed to support on-screen keyboard used with touch screen devices
|
||||
# see https://github.com/NixOS/nixpkgs/issues/25968
|
||||
caribou
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
@ -58,6 +55,7 @@ in stdenv.mkDerivation rec {
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit libgnomekbd unzip;
|
||||
gsettings = "${glib.bin}/bin/gsettings";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -11,12 +11,20 @@
|
||||
null);
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button {
|
||||
let description = xkbLayout;
|
||||
@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button {
|
||||
if (xkbVariant.length > 0)
|
||||
description = description + '\t' + xkbVariant;
|
||||
description = `${description}\t${xkbVariant}`;
|
||||
|
||||
- Util.spawn(['gkbd-keyboard-display', '-l', description]);
|
||||
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
|
||||
}
|
||||
});
|
||||
--- a/data/gnome-shell-disable-extensions.service
|
||||
+++ b/data/gnome-shell-disable-extensions.service
|
||||
@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
|
||||
[Service]
|
||||
Type=simple
|
||||
# Disable extensions
|
||||
-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
|
||||
+ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
|
||||
Restart=no
|
||||
|
||||
@ -11,11 +11,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "3.32.4";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4";
|
||||
sha256 = "1mr03s6f38pbgvgpb1p91csqms369f1lzqyk5nfam5jqyl273nzk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
|
||||
, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
|
||||
, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }:
|
||||
, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme, glib, pcre2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-terminal";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
|
||||
sha256 = "0wcavripfsr691qkcjb71vccffz0wx2q5qh4clwnk1hi8j1hz9l5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig intltool itstool which libxml2
|
||||
vala desktop-file-utils wrapGAppsHook
|
||||
vala desktop-file-utils wrapGAppsHook pcre2
|
||||
hicolor-icon-theme # for setup-hook
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
# Silly ./configure, it looks for dbus file from gnome-shell in the
|
||||
# installation tree of the package it is configuring.
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-docs";
|
||||
version = "3.32.3";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
|
||||
sha256 = "1v94mz8zwzx67db2avbi9p2klw36cz45qr6fbskpvygz2pzhg6cg";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
{ stdenv
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, apacheHttpd
|
||||
, nautilus
|
||||
, pkgconfig
|
||||
@ -14,36 +17,55 @@
|
||||
, mod_dnssd
|
||||
, gnome3
|
||||
, libcanberra-gtk3
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-share";
|
||||
version = "3.32.0.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945";
|
||||
sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix gio-unix-2.0 lookup
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch;
|
||||
sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
|
||||
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
|
||||
-i data/dav_user_2.4.conf
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-httpd=${apacheHttpd.out}/bin/httpd"
|
||||
"--with-modules-path=${apacheHttpd.dev}/modules"
|
||||
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
|
||||
"--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
|
||||
mesonFlags = [
|
||||
"-Dhttpd=${apacheHttpd.out}/bin/httpd"
|
||||
"-Dmodules_path=${apacheHttpd.dev}/modules"
|
||||
"-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user"
|
||||
# In 3.34.0 it defaults to false but it is silently ignored and always installed.
|
||||
# Let’s add it anyway in case they decide to make build respect the option in the future.
|
||||
"-Dnautilus_extension=true"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
itstool
|
||||
libxml2
|
||||
wrapGAppsHook
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
|
||||
From: worldofpeace <worldofpeace@protonmail.ch>
|
||||
Date: Mon, 16 Sep 2019 11:18:27 -0400
|
||||
Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
|
||||
|
||||
---
|
||||
src/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 182f7f5f5..43060865b 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -710,7 +710,7 @@ if have_profiler
|
||||
'backends/meta-profiler.h',
|
||||
]
|
||||
|
||||
- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
|
||||
+ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
|
||||
sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
|
||||
|
||||
dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
|
||||
--
|
||||
2.22.1
|
||||
|
||||
@ -7,17 +7,19 @@
|
||||
, xorgserver
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, sysprof
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva";
|
||||
sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
|
||||
# for cvt command
|
||||
xorgserver
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -47,21 +50,48 @@ stdenv.mkDerivation rec {
|
||||
geocode-glib libinput libgudev libwacom
|
||||
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
|
||||
libxkbcommon pipewire xwayland
|
||||
gnome-settings-daemon
|
||||
gnome-settings-daemon sysprof
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "ensure-emit-x11-display-opened.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
|
||||
sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
|
||||
})
|
||||
# fix animation related crashes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/805
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/63a0b702c94af013b94ad3f32a8c5ba86bf6dfba.patch";
|
||||
sha256 = "13hvz3n275crvpankj1b47nds71c42nnbq1yx2xhhvk60qc72vh4";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/1e637bd7e1b2a4316d1cf6da80966d43819a10df.patch";
|
||||
sha256 = "0jcx33j2sw7hva0gs0svqg69habxxmgdi0kcb07nqq2df6pb62qf";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/c9c53cb55fd6e782c50f36da1e2adbf28111a660.patch";
|
||||
sha256 = "0iwjlbr8j0icigmilpghlkcyg4hll9dm0mcaj8lvi7qxrgjrmczr";
|
||||
})
|
||||
# Fix crash when pressing ctrl-super: https://gitlab.gnome.org/GNOME/mutter/issues/823
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/0706e021f5bd82cf4c9b2c0d2916d272f3cba406.patch";
|
||||
sha256 = "0i4ixr419jggrd17gxxs45jnx131lnp8wkkhhygqsrpq8941sdw6";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/76f2579e442d8ad0a3b8b644daab7c72a585506b.patch";
|
||||
sha256 = "0c3ls624k9f4mqrrbv8ng0slvm31l0li6ciqn04qd4yi18plnldy";
|
||||
})
|
||||
# Avoid crashing any apps on X11 when restarting: https://gitlab.gnome.org/GNOME/mutter/merge_requests/808
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/f352c3d79da99e961341c1d2b5dd334dcade0271.patch";
|
||||
sha256 = "1drn8wjbkj903jxay5wxq163i9ahp558sjl2bc3fi1qs90xj6cn2";
|
||||
})
|
||||
# TODO: submit upstream
|
||||
./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit zenity;
|
||||
})
|
||||
# Fix a segmentation fault in dri_flush_front_buffer() upon
|
||||
# suspend/resume. This change should be removed when Mutter
|
||||
# is updated to 3.34.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
|
||||
sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
|
||||
+++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
|
||||
@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array,
|
||||
g_return_val_if_fail (script->s_infile != NULL, FALSE);
|
||||
|
||||
add_args (array,
|
||||
- "bwrap",
|
||||
- "--ro-bind", "/usr", "/usr",
|
||||
- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
|
||||
+ "@bubblewrap_bin@",
|
||||
+ "--ro-bind", "@storeDir@", "@storeDir@",
|
||||
+ "--ro-bind", "/run/current-system", "/run/current-system",
|
||||
NULL);
|
||||
|
||||
/* These directories might be symlinks into /usr/... */
|
||||
@ -1,33 +1,77 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
|
||||
, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
|
||||
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
|
||||
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf
|
||||
, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, gettext
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, gnome3
|
||||
, gnome-autoar
|
||||
, glib-networking
|
||||
, shared-mime-info
|
||||
, libnotify
|
||||
, libexif
|
||||
, libseccomp
|
||||
, exempi
|
||||
, librsvg
|
||||
, tracker
|
||||
, tracker-miners
|
||||
, gexiv2
|
||||
, libselinux
|
||||
, gdk-pixbuf
|
||||
, substituteAll
|
||||
, gnome-desktop
|
||||
, gst_all_1
|
||||
, gsettings-desktop-schemas
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nautilus";
|
||||
version = "3.32.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1ncs5hmaxjb9p2yzj81m7dz2x27vzmvppir3058dk236jzn98r36";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook
|
||||
desktop-file-utils
|
||||
gettext
|
||||
gobject-introspection
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
|
||||
tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
|
||||
gnome3.adwaita-icon-theme gsettings-desktop-schemas
|
||||
exempi
|
||||
gexiv2
|
||||
glib-networking
|
||||
gnome-desktop
|
||||
gnome3.adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk3
|
||||
libexif
|
||||
libnotify
|
||||
libseccomp
|
||||
libselinux
|
||||
shared-mime-info
|
||||
tracker
|
||||
tracker-miners
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gnome-autoar ];
|
||||
propagatedBuildInputs = [
|
||||
gnome-autoar
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
@ -44,13 +88,6 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./extension_dir.patch
|
||||
# 3.30 now generates it's own thummbnails,
|
||||
# and no longer depends on `gnome-desktop`
|
||||
(substituteAll {
|
||||
src = ./bubblewrap-paths.patch;
|
||||
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
|
||||
inherit (builtins) storeDir;
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "3.32.2.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
|
||||
sha256 = "1fxqrwhpvm7y83zrn85wg2avwlcmkfjvv1gb6br6v58zi6fvny3k";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
|
||||
, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs
|
||||
, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs
|
||||
, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
|
||||
, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
|
||||
, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sushi";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
|
||||
sha256 = "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
buildInputs = [
|
||||
glib gtk3 gnome3.evince icu harfbuzz
|
||||
clutter-gtk clutter-gst gjs gtksourceview gdk-pixbuf
|
||||
librsvg libmusicbrainz5 webkitgtk
|
||||
clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf
|
||||
librsvg libmusicbrainz5 webkitgtk epoxy
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "totem";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
|
||||
sha256 = "00fpm3609zckiqjrlg3r64vz2mqych44kdkljxbidb847vg6xm84";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
@ -31,14 +31,6 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
|
||||
# https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=784236
|
||||
# https://github.com/mesonbuild/meson/issues/1994
|
||||
"-Denable-vala=no"
|
||||
];
|
||||
|
||||
checkInputs = [ xvfb_run ];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -1,23 +1,38 @@
|
||||
{ stdenv, intltool, fetchurl, pkgconfig
|
||||
, itstool, libxml2, libxslt, gnome3 }:
|
||||
{ stdenv
|
||||
, gettext
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, itstool
|
||||
, libxml2
|
||||
, libxslt
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp-xsl";
|
||||
version = "3.32.1";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
|
||||
sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; };
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
gettext
|
||||
itstool
|
||||
libxml2
|
||||
libxslt
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ intltool itstool libxml2 libxslt ];
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Yelp;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp";
|
||||
version = "3.32.2";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
|
||||
sha256 = "0ifhgdxff2xx2damaj72gpjln5k36grg2chvi4335mv3b5y55mp3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
|
||||
|
||||
@ -79,6 +79,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
libgnome-keyring = callPackage ./core/libgnome-keyring { };
|
||||
|
||||
gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
|
||||
|
||||
gnome-online-miners = callPackage ./core/gnome-online-miners { };
|
||||
|
||||
gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { };
|
||||
@ -215,8 +217,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
gnome-weather = callPackage ./apps/gnome-weather { };
|
||||
|
||||
nautilus-sendto = callPackage ./apps/nautilus-sendto { };
|
||||
|
||||
polari = callPackage ./apps/polari { };
|
||||
|
||||
seahorse = callPackage ./apps/seahorse { };
|
||||
@ -338,7 +338,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
|
||||
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
|
||||
easytag meld orca rhythmbox shotwell gnome-usage
|
||||
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
|
||||
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
|
||||
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
|
||||
inherit (pkgs) gnome-video-effects; # added 2019-08-19
|
||||
inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
|
||||
@ -356,4 +356,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`";
|
||||
optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`";
|
||||
gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
|
||||
|
||||
nautilus-sendto = throw "deprecated 2019-09-17: abandoned";
|
||||
})
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "anjuta";
|
||||
version = "3.28.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
|
||||
sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "devhelp";
|
||||
version = "3.32.0";
|
||||
version = "3.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
|
||||
sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-appindicator";
|
||||
version = "29";
|
||||
version = "30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ubuntu";
|
||||
repo = "gnome-shell-extension-appindicator";
|
||||
rev = "v${version}";
|
||||
sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i";
|
||||
sha256 = "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8";
|
||||
};
|
||||
|
||||
# This package has a Makefile, but it's used for building a zip for
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-arc-menu";
|
||||
version = "31";
|
||||
version = "33.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "LinxGem33";
|
||||
repo = "Arc-Menu";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1";
|
||||
rev = "v${version}-dev";
|
||||
sha256 = "1dd9ysiyza6drwdv4qcxyijy7yijirjf2fd1aq5jv8s4bqajcqf4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
glib gettext
|
||||
];
|
||||
|
||||
makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ];
|
||||
makeFlags = [ "INSTALL_BASE=${placeholder "out"}/share/gnome-shell/extensions" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, glib, gettext, bash }:
|
||||
{ stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-caffeine";
|
||||
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ eperuffo ];
|
||||
homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
|
||||
broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-clipboard-indicator";
|
||||
@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ jonafato ];
|
||||
platforms = platforms.linux;
|
||||
homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator;
|
||||
broken = versionAtLeast gnome3.gnome-shell.version "3.26";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-dash-to-dock";
|
||||
version = "66";
|
||||
version = "20190921";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micheleg";
|
||||
repo = "dash-to-dock";
|
||||
rev = "extensions.gnome.org-v" + version;
|
||||
sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh";
|
||||
# rev = "extensions.gnome.org-v" + version;
|
||||
rev = "d918d29a6afced8823dc954a4317988b79aad6b8";
|
||||
sha256 = "1wlmbcn8zs8xiyxhgdcbnf2igjsjg0bkcsvjpy8fk13fxshxsqx6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-gsconnect";
|
||||
version = "23";
|
||||
version = "26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${version}";
|
||||
sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid";
|
||||
sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
upower
|
||||
gnome3.caribou
|
||||
gnome3.gjs # for running daemon
|
||||
gnome3.evolution-data-server # folks.py requires org.gnome.Evolution.DefaultSources gsettings; TODO: hardcode the schema path to the library (similarly to https://github.com/NixOS/nixpkgs/issues/47226)
|
||||
gnome3.evolution-data-server # for libebook-contacts typelib
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -29,16 +29,32 @@
|
||||
const Gio = imports.gi.Gio;
|
||||
const GLib = imports.gi.GLib;
|
||||
const Gtk = imports.gi.Gtk;
|
||||
--- a/src/service/__init__.js
|
||||
+++ b/src/service/__init__.js
|
||||
@@ -600,7 +600,9 @@
|
||||
/**
|
||||
* Convenience functions for saving/restoring window geometry
|
||||
*/
|
||||
-const _mutter = new Gio.Settings({schema_id: 'org.gnome.mutter'});
|
||||
+const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
|
||||
+const _schema = _schema_source.lookup('org.gnome.mutter', false);
|
||||
+const _mutter = new Gio.Settings({settings_schema: _schema});
|
||||
--- a/src/preferences/service.js
|
||||
+++ b/src/preferences/service.js
|
||||
@@ -435,9 +435,9 @@ var Window = GObject.registerClass({
|
||||
|
||||
_restoreGeometry() {
|
||||
if (this._mutterSettings === undefined) {
|
||||
- this._mutterSettings = new Gio.Settings({
|
||||
- schema_id: 'org.gnome.mutter'
|
||||
- });
|
||||
+ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
|
||||
+ const _schema = _schema_source.lookup('org.gnome.mutter', false);
|
||||
+ this._mutterSettings = new Gio.Settings({settings_schema: _schema});
|
||||
}
|
||||
|
||||
// Restore geometry, even if we're going to maximize
|
||||
--- a/src/service/ui/messaging.js
|
||||
+++ b/src/service/ui/messaging.js
|
||||
@@ -891,9 +891,9 @@ var Window = GObject.registerClass({
|
||||
*/
|
||||
_restoreGeometry() {
|
||||
if (this._mutterSettings === undefined) {
|
||||
- this._mutterSettings = new Gio.Settings({
|
||||
- schema_id: 'org.gnome.mutter'
|
||||
- });
|
||||
+ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
|
||||
+ const _schema = _schema_source.lookup('org.gnome.mutter', false);
|
||||
+ this._mutterSettings = new Gio.Settings({settings_schema: _schema});
|
||||
}
|
||||
|
||||
Gtk.Window.prototype.restore_geometry = function() {
|
||||
let [width, height] = this.settings.get_value('window-size').deep_unpack();
|
||||
|
||||
@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ jonafato ];
|
||||
platforms = gnome3.gnome-shell.meta.platforms;
|
||||
homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider;
|
||||
broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user