Merge #160343: GNOME: 41 -> 42
This commit is contained in:
Vladimír Čunát
commit
b9eab51eed
|
|
@ -25,6 +25,16 @@
|
|||
<literal>services.nginx.virtualHosts.*.enableACME</literal>).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
GNOME has been upgraded to 42. Please take a look at their
|
||||
<link xlink:href="https://release.gnome.org/42/">Release
|
||||
Notes</link> for details. Notably, it replaces gedit with
|
||||
GNOME Text Editor, GNOME Terminal with GNOME Console (formerly
|
||||
King’s Cross), and GNOME Screenshot with a tool built into the
|
||||
Shell.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP 8.1 is now available
|
||||
|
|
@ -670,6 +680,16 @@
|
|||
6.x</link> and renamed to <literal>gnome-secrets</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.gnome.experimental-features.realtime-scheduling</literal>
|
||||
option has been removed, as GNOME Shell now
|
||||
<link xlink:href="https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060">uses
|
||||
rtkit</link>. Use
|
||||
<literal>security.rtkit.enable = true;</literal> instead. As
|
||||
before, you will need to have it enabled using GSettings.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
If you previously used
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
the option to use DNS-01 validation when using `enableACME` on
|
||||
web server virtual hosts (e.g. `services.nginx.virtualHosts.*.enableACME`).
|
||||
|
||||
- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell.
|
||||
|
||||
- PHP 8.1 is now available
|
||||
|
||||
- Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).
|
||||
|
|
@ -275,6 +277,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`.
|
||||
|
||||
- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings.
|
||||
|
||||
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
|
||||
|
||||
- Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected.
|
||||
|
|
|
|||
|
|
@ -132,6 +132,10 @@ in
|
|||
[ "environment" "gnome3" "excludePackages" ]
|
||||
[ "environment" "gnome" "excludePackages" ]
|
||||
)
|
||||
(mkRemovedOptionModule
|
||||
[ "services" "gnome" "experimental-features" "realtime-scheduling" ]
|
||||
"Set `security.rtkit.enable = true;` to make realtime scheduling possible. (Still needs to be enabled using GSettings.)"
|
||||
)
|
||||
];
|
||||
|
||||
options = {
|
||||
|
|
@ -142,38 +146,6 @@ in
|
|||
core-utilities.enable = mkEnableOption "GNOME core utilities";
|
||||
core-developer-tools.enable = mkEnableOption "GNOME core developer tools";
|
||||
games.enable = mkEnableOption "GNOME games";
|
||||
|
||||
experimental-features = {
|
||||
realtime-scheduling = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Makes mutter (which propagates to gnome-shell) request a low priority real-time
|
||||
scheduling which is only available on the wayland session.
|
||||
To enable this experimental feature it requires a restart of the compositor.
|
||||
Note that enabling this option only enables the <emphasis>capability</emphasis>
|
||||
for realtime-scheduling to be used. It doesn't automatically set the gsetting
|
||||
so that mutter actually uses realtime-scheduling. This would require adding <literal>
|
||||
rt-scheduler</literal> to <literal>/org/gnome/mutter/experimental-features</literal>
|
||||
with dconf-editor. You cannot use extraGSettingsOverrides because that will only
|
||||
change the default value of the setting.
|
||||
|
||||
Please be aware of these known issues with the feature in nixos:
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/90201">NixOS/nixpkgs#90201</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/86730">NixOS/nixpkgs#86730</link>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.gnome = {
|
||||
|
|
@ -480,29 +452,6 @@ in
|
|||
];
|
||||
})
|
||||
|
||||
# Enable soft realtime scheduling, only supported on wayland
|
||||
(mkIf serviceCfg.experimental-features.realtime-scheduling {
|
||||
security.wrappers.".gnome-shell-wrapped" = {
|
||||
source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped";
|
||||
owner = "root";
|
||||
group = "root";
|
||||
capabilities = "cap_sys_nice=ep";
|
||||
};
|
||||
|
||||
systemd.user.services.gnome-shell-wayland = let
|
||||
gnomeShellRT = with pkgs.gnome; pkgs.runCommand "gnome-shell-rt" {} ''
|
||||
mkdir -p $out/bin/
|
||||
cp ${gnome-shell}/bin/gnome-shell $out/bin
|
||||
sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell
|
||||
'';
|
||||
in {
|
||||
# Note we need to clear ExecStart before overriding it
|
||||
serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"];
|
||||
# Do not use the default environment, it provides a broken PATH
|
||||
environment = mkForce {};
|
||||
};
|
||||
})
|
||||
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst
|
||||
(mkIf serviceCfg.core-utilities.enable {
|
||||
environment.systemPackages =
|
||||
|
|
@ -513,18 +462,18 @@ in
|
|||
cheese
|
||||
eog
|
||||
epiphany
|
||||
gedit
|
||||
pkgs.gnome-text-editor
|
||||
gnome-calculator
|
||||
gnome-calendar
|
||||
gnome-characters
|
||||
gnome-clocks
|
||||
pkgs.gnome-console
|
||||
gnome-contacts
|
||||
gnome-font-viewer
|
||||
gnome-logs
|
||||
gnome-maps
|
||||
gnome-music
|
||||
pkgs.gnome-photos
|
||||
gnome-screenshot
|
||||
gnome-system-monitor
|
||||
gnome-weather
|
||||
nautilus
|
||||
|
|
@ -547,7 +496,6 @@ in
|
|||
programs.file-roller.enable = notExcluded pkgs.gnome.file-roller;
|
||||
programs.geary.enable = notExcluded pkgs.gnome.geary;
|
||||
programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
|
||||
programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal;
|
||||
programs.seahorse.enable = notExcluded pkgs.gnome.seahorse;
|
||||
services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
|
||||
|
||||
|
|
|
|||
|
|
@ -220,9 +220,7 @@ in
|
|||
] config.environment.pantheon.excludePackages);
|
||||
|
||||
programs.evince.enable = mkDefault true;
|
||||
programs.evince.package = pkgs.pantheon.evince;
|
||||
programs.file-roller.enable = mkDefault true;
|
||||
programs.file-roller.package = pkgs.pantheon.file-roller;
|
||||
|
||||
# Settings from elementary-default-settings
|
||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||
|
|
@ -304,7 +302,6 @@ in
|
|||
environment.systemPackages = with pkgs.pantheon; [
|
||||
contractor
|
||||
file-roller-contract
|
||||
gnome-bluetooth-contract
|
||||
];
|
||||
|
||||
environment.pathsToLink = [
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ in
|
|||
GDM_X_SERVER_EXTRA_ARGS = toString
|
||||
(filter (arg: arg != "-terminate") cfg.xserverArgs);
|
||||
# GDM is needed for gnome-login.session
|
||||
XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share";
|
||||
XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share:${pkgs.gnome.gnome-control-center}/share";
|
||||
} // optionalAttrs (xSessionWrapper != null) {
|
||||
# Make GDM use this wrapper before running the session, which runs the
|
||||
# configured setupCommands. This relies on a patched GDM which supports
|
||||
|
|
|
|||
|
|
@ -3,4 +3,10 @@
|
|||
makeInstalledTest {
|
||||
tested = pkgs.gjs;
|
||||
withX11 = true;
|
||||
|
||||
testConfig = {
|
||||
environment.systemPackages = [
|
||||
pkgs.gjs
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, glib
|
||||
, gtk3
|
||||
, wayland
|
||||
|
|
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
wayland
|
||||
wayland-protocols
|
||||
libxml2
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
, json-glib
|
||||
, jsonrpc-glib
|
||||
, libdazzle
|
||||
, libhandy
|
||||
, libpeas
|
||||
, libportal-gtk3
|
||||
, libxml2
|
||||
|
|
@ -40,21 +41,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-builder";
|
||||
version = "41.3";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "4iUPyOnp8gAsRS5ZUNgmhXNNPESAs1Fnq1CKyHAlCeE=";
|
||||
sha256 = "Uu/SltaLL/GCNBwEgdz9cGVMQIvbZ5/Ot225cDwiQo8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with latest libportal
|
||||
# https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/486
|
||||
# Fix appstream validation
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1.patch";
|
||||
sha256 = "B/uCcYavFvOAPhLHZ4MRNENDd6VytILiGYwDZRUSxTE=";
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/d7151679e0c925d27216256dc32fe67fb298d059.patch";
|
||||
sha256 = "vdNJawkqSBaFGRZvxzvjOryQpBL4jcN7tr1t3ihD7LA=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
|
|||
json-glib
|
||||
jsonrpc-glib
|
||||
libdazzle
|
||||
libhandy
|
||||
libxml2
|
||||
ostree
|
||||
pcre
|
||||
|
|
@ -103,10 +104,6 @@ stdenv.mkDerivation rec {
|
|||
xvfb-run
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddocs=true"
|
||||
|
||||
|
|
@ -122,6 +119,10 @@ stdenv.mkDerivation rec {
|
|||
# understand why. Somebody should look into fixing this.
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-photos";
|
||||
version = "40.0";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0";
|
||||
sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gthumb";
|
||||
version = "3.12.0";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8=";
|
||||
sha256 = "sha256-ZDBmOgAHBpbGgeXru4AQc/1GpG1oEsKeL5pPgRr6Gfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, cairo
|
||||
, cmake
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, ghostscript
|
||||
, glib
|
||||
|
|
@ -71,6 +72,13 @@ stdenv.mkDerivation rec {
|
|||
# e.g., those from the "Effects" menu.
|
||||
python3 = "${python3Env}/bin/python";
|
||||
})
|
||||
|
||||
# Fix build with poppler 22.03
|
||||
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4187
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch";
|
||||
sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ mkDerivation, lib, extra-cmake-modules
|
||||
{ mkDerivation, fetchpatch, lib, extra-cmake-modules
|
||||
, qtdeclarative, ki18n, kmime, kpkpass
|
||||
, poppler, kcontacts, kcalendarcore
|
||||
, shared-mime-info
|
||||
|
|
@ -10,6 +10,15 @@ mkDerivation {
|
|||
license = with lib.licenses; [ lgpl21 ];
|
||||
maintainers = [ lib.maintainers.bkchr ];
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with poppler 22.03
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch";
|
||||
sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
shared-mime-info # for update-mime-database
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config
|
||||
, gnome, gnupg, gtk3, udisks
|
||||
, gnome-desktop, gnupg, gtk3, udisks
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoconf autoconf-archive automake glib intltool libtool pkg-config
|
||||
];
|
||||
buildInputs = [ gnome.gnome-desktop gtk3 udisks ];
|
||||
buildInputs = [ gnome-desktop gtk3 udisks ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
let
|
||||
|
||||
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
|
||||
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ];
|
||||
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ];
|
||||
xorgDeps = pkgs: with pkgs.xorg; [
|
||||
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
|
||||
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1/Jy6ps3+9ZFTkAh5GU4okcibhwKxXDW4rhOlxmqKv4=";
|
||||
sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, wrapGAppsHook
|
||||
, libinput
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, glib
|
||||
, gtk3
|
||||
, wayland
|
||||
|
|
@ -68,7 +69,7 @@ in stdenv.mkDerivation rec {
|
|||
libinput
|
||||
glib
|
||||
gtk3
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
# For keybindings settings schemas
|
||||
gnome.mutter
|
||||
wayland
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, evolution-data-server
|
||||
, feedbackd
|
||||
, glibmm
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, gspell
|
||||
, gtk3
|
||||
, json-glib
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
evolution-data-server
|
||||
feedbackd
|
||||
glibmm
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
gspell
|
||||
gtk3
|
||||
json-glib
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.42.4";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "gpIW4GBXT0GCtV7Q8EfdEeK56gCACi+PJ/jbwQkVQbk=";
|
||||
sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, ninja
|
||||
, intltool
|
||||
|
|
@ -25,6 +26,7 @@
|
|||
, gcr
|
||||
, sqlite
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, librsvg
|
||||
, gdk-pixbuf
|
||||
, libsecret
|
||||
|
|
@ -32,6 +34,8 @@
|
|||
, nspr
|
||||
, icu
|
||||
, libcanberra-gtk3
|
||||
, geocode-glib
|
||||
, cmark
|
||||
, bogofilter
|
||||
, gst_all_1
|
||||
, procps
|
||||
|
|
@ -42,11 +46,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.42.4";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "+oprem1GsinbXfIv3nZCVFIjV/4b7NexjlNt/piJCmU=";
|
||||
sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -68,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
glib
|
||||
glib-networking
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
gsettings-desktop-schemas
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
|
|
@ -77,6 +81,8 @@ stdenv.mkDerivation rec {
|
|||
highlight
|
||||
icu
|
||||
libcanberra-gtk3
|
||||
geocode-glib
|
||||
cmark
|
||||
libgdata
|
||||
libgweather
|
||||
libical
|
||||
|
|
@ -106,6 +112,7 @@ stdenv.mkDerivation rec {
|
|||
"-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"
|
||||
"-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter"
|
||||
"-DWITH_OPENLDAP=${openldap}"
|
||||
"-DWITH_GWEATHER4=ON"
|
||||
];
|
||||
|
||||
requiredSystemFeatures = [
|
||||
|
|
|
|||
|
|
@ -82,7 +82,15 @@ in (mkDrv rec {
|
|||
tar -xf ${srcs.translations}
|
||||
'';
|
||||
|
||||
patches = [ ./skip-failed-test-with-icu70.patch ];
|
||||
patches = [
|
||||
./skip-failed-test-with-icu70.patch
|
||||
|
||||
# Fix build with poppler 22.03
|
||||
(fetchurl {
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch";
|
||||
sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls=";
|
||||
})
|
||||
];
|
||||
|
||||
### QT/KDE
|
||||
#
|
||||
|
|
|
|||
|
|
@ -54,6 +54,36 @@ mkDerivation rec {
|
|||
url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
|
||||
sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
|
||||
})
|
||||
# For Poppler 22.02
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
|
||||
sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
|
||||
sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
|
||||
})
|
||||
# For Poppler 22.03
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
|
||||
sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
|
||||
sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
|
||||
sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
|
||||
sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
|
||||
sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gettext
|
||||
, gnome
|
||||
, libgtop
|
||||
, gtk3
|
||||
, libhandy
|
||||
, pcre2
|
||||
, vte
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, git
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, sassc
|
||||
, wrapGAppsHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-console";
|
||||
version = "42.beta";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Lq/shyAhDcwB5HqpihvGx2+xwVU2Xax7/NerFwR36DQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libgtop
|
||||
gnome.nautilus
|
||||
gtk3
|
||||
libhandy
|
||||
pcre2
|
||||
vte
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
git
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
sassc
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.kgx;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple user-friendly terminal emulator for the GNOME desktop";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/console";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]);
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, genericBranding ? false
|
||||
, fetchFromGitLab
|
||||
, gettext
|
||||
, gnome
|
||||
, libgtop
|
||||
, gtk3
|
||||
, libhandy
|
||||
, pcre2
|
||||
, vte
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, git
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, sassc
|
||||
, wrapGAppsHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kgx";
|
||||
version = "unstable-2021-03-13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "ZanderBrown";
|
||||
repo = "kgx";
|
||||
rev = "105adb6a8d09418a3ce622442aef6ae623dee787";
|
||||
sha256 = "0m34y0nbcfkyicb40iv0iqaq6f9r3f66w43lr803j3351nxqvcz2";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libgtop
|
||||
gnome.nautilus
|
||||
gtk3
|
||||
libhandy
|
||||
pcre2
|
||||
vte
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
git
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
sassc
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
mesonFlags = lib.optional genericBranding "-Dgeneric=true";
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace $out/share/applications/org.gnome.zbrown.KingsCross.desktop \
|
||||
--replace "Exec=kgx" "Exec=$out/bin/kgx"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.kgx;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple user-friendly terminal emulator for the GNOME desktop";
|
||||
homepage = "https://gitlab.gnome.org/ZanderBrown/kgx";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
, libpeas
|
||||
, librsvg
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, libnotify
|
||||
, gsound
|
||||
, meson
|
||||
|
|
@ -52,7 +53,7 @@ python3Packages.buildPythonApplication rec {
|
|||
gtk3
|
||||
libpeas
|
||||
librsvg
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
gsound
|
||||
gnome.adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
, glib
|
||||
, gtk3
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, gcr
|
||||
, pam
|
||||
, systemd
|
||||
|
|
@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
networkmanager
|
||||
polkit
|
||||
gnome.gnome-control-center
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
gnome.gnome-session
|
||||
gtk3
|
||||
pam
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-docs";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xcIld06i7EXyfFIoLs/tJDRr3ExxEFod7G7/sWROVo=";
|
||||
sha256 = "srJ9oEEAu90vTw5bw48tBW2V+jZWcgFj9kNqMWfV6QU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mobile-broadband-provider-info";
|
||||
version = "20210805";
|
||||
version = "20220315";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-a/ihVY6lVBr7xve0QV50zJ9aqYKbE07Ks+8ch0ElaLw=";
|
||||
sha256 = "sha256-H82sctF52xQnl4Nm9wG+HDx1Nf1aZYvFzIKCR8b2RcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glibcLocales
|
||||
|
|
@ -17,33 +16,23 @@
|
|||
, glib
|
||||
, gnome
|
||||
, gtk3
|
||||
, libhandy
|
||||
, json-glib
|
||||
, libarchive
|
||||
, libnotify
|
||||
, nautilus
|
||||
, pantheon
|
||||
, unzip
|
||||
, withPantheon ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "file-roller";
|
||||
version = "3.40.0";
|
||||
version = "3.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a";
|
||||
sha256 = "HEOObVPsEP9PLrWyLXu/KKfCqElXq2SnUcHN88UjAsc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Make this respect dark mode settings from Pantheon
|
||||
# https://github.com/elementary/fileroller/
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/elementary/fileroller/f183eac36c68c9c9441e72294d4e305cf5fe36ed/fr-application-prefers-color-scheme.patch";
|
||||
sha256 = "sha256-d/sqf4Oen9UrzYqru7Ck15o/6g6WfxRDH/iAGFXgYAA=";
|
||||
})
|
||||
];
|
||||
|
||||
LANG = "en_US.UTF-8"; # postinstall.py
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -65,12 +54,11 @@ stdenv.mkDerivation rec {
|
|||
glib
|
||||
gnome.adwaita-icon-theme
|
||||
gtk3
|
||||
libhandy
|
||||
json-glib
|
||||
libarchive
|
||||
libnotify
|
||||
nautilus
|
||||
] ++ lib.optionals withPantheon [
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gi-docgen
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
|
|
@ -11,23 +13,38 @@
|
|||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, gtk3
|
||||
, gtk4
|
||||
, glib
|
||||
, atk
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "3.41.1";
|
||||
version = "4.beta.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "i3nPAJ6uXEfK0KtT4hmcOm+y86thh381m+1SR3DuYfc=";
|
||||
url = "mirror://gnome/sources/ghex/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sBS/9cY++uHLGCbLeex8ZW697JJn3dK+HaM6tHBdwJ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with -Werror=format-security
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/3d35359f3a12b6abb4a3d8a12a0f39b7221be408.patch";
|
||||
sha256 = "4z9nUd+/eBOUGwl3MErse+FKLzGqtWKwkIzej57CnYk=";
|
||||
})
|
||||
# Build devhelp index.
|
||||
# https://gitlab.gnome.org/GNOME/ghex/-/merge_requests/25
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/b26a7b1135ea2fe956a9bc0669b3b6ed818716c3.patch";
|
||||
sha256 = "nYjjxds9GNWkW/RhXEe5zJzPF4TnLMsCELEqYR4dXTk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
|
|
@ -35,12 +52,14 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gi-docgen
|
||||
python3
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
atk
|
||||
glib
|
||||
];
|
||||
|
|
@ -50,9 +69,18 @@ stdenv.mkDerivation rec {
|
|||
desktop-file-utils
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "41.3";
|
||||
version = "42.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "m4QGgNHnOG/d/WoVrU3Q8s2ljv6BjPVHg3tGrovw4Yk=";
|
||||
sha256 = "GuIS/4mZFVQuxTtU2VtozfJx2VjPUSzcP+3Hgixu4SM=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,40 +1,54 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, libdazzle
|
||||
, wrapGAppsHook4
|
||||
, libgweather
|
||||
, geoclue2
|
||||
, geocode-glib
|
||||
, python3
|
||||
, gettext
|
||||
, libxml2
|
||||
, gnome
|
||||
, gtk3
|
||||
, gtk4
|
||||
, evolution-data-server
|
||||
, libical
|
||||
, libsoup
|
||||
, glib
|
||||
, gnome-online-accounts
|
||||
, gsettings-desktop-schemas
|
||||
, libhandy
|
||||
, adwaita-icon-theme
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo=";
|
||||
sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84
|
||||
# A refactor has caused the PR patch to drift enough to need rebasing
|
||||
./gtk_image_reset_crash.patch
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
libxml2
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
evolution-data-server # waiting for GTK4 port
|
||||
libical
|
||||
libsoup
|
||||
glib
|
||||
libgweather
|
||||
geoclue2
|
||||
geocode-glib
|
||||
gsettings-desktop-schemas
|
||||
libadwaita
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
@ -44,41 +58,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
libxml2
|
||||
wrapGAppsHook
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
evolution-data-server
|
||||
libsoup
|
||||
glib
|
||||
gnome-online-accounts
|
||||
libdazzle
|
||||
libgweather
|
||||
geoclue2
|
||||
geocode-glib
|
||||
gsettings-desktop-schemas
|
||||
adwaita-icon-theme
|
||||
libhandy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs build-aux/meson/meson_post_install.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Calendar";
|
||||
description = "Simple and beautiful calendar application for GNOME";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c
|
||||
index ac32a8f9..532425c1 100644
|
||||
--- a/src/gui/views/gcal-year-view.c
|
||||
+++ b/src/gui/views/gcal-year-view.c
|
||||
@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self)
|
||||
if (!updated)
|
||||
{
|
||||
gtk_label_set_text (self->temp_label, "");
|
||||
- gtk_image_clear (self->weather_icon);
|
||||
+ /* FIXME: This should never be NULL, but it somehow is.
|
||||
+ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299
|
||||
+ */
|
||||
+ if (self->weather_icon != NULL)
|
||||
+ gtk_image_clear (self->weather_icon);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -7,26 +7,26 @@
|
|||
, gettext
|
||||
, gnome
|
||||
, glib
|
||||
, gtk3
|
||||
, gtk4
|
||||
, pango
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, gobject-introspection
|
||||
, gjs
|
||||
, libunistring
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, gsettings-desktop-schemas
|
||||
, adwaita-icon-theme
|
||||
, gnome-desktop
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-characters";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1";
|
||||
sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,39 +36,39 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
|
||||
buildInputs = [
|
||||
adwaita-icon-theme
|
||||
gjs
|
||||
glib
|
||||
gnome-desktop # for typelib
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
gtk4
|
||||
libunistring
|
||||
libhandy
|
||||
libadwaita
|
||||
pango
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/70
|
||||
substituteInPlace meson_post_install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/31168
|
||||
postFixup = ''
|
||||
for file in $out/share/org.gnome.Characters/org.gnome.Characters \
|
||||
$out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService
|
||||
do
|
||||
sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
|
||||
-i $file
|
||||
|
||||
wrapGApp "$file"
|
||||
done
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/31168
|
||||
file="$out/share/org.gnome.Characters/org.gnome.Characters"
|
||||
sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
|
||||
-i $file
|
||||
wrapGApp "$file"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -7,35 +8,34 @@
|
|||
, wrapGAppsHook
|
||||
, itstool
|
||||
, desktop-file-utils
|
||||
, vala
|
||||
, vala_0_56
|
||||
, gobject-introspection
|
||||
, libxml2
|
||||
, gtk3
|
||||
, gtk4
|
||||
, glib
|
||||
, gsound
|
||||
, sound-theme-freedesktop
|
||||
, gsettings-desktop-schemas
|
||||
, adwaita-icon-theme
|
||||
, gnome-desktop
|
||||
, geocode-glib
|
||||
, gnome
|
||||
, gdk-pixbuf
|
||||
, geoclue2
|
||||
, libgweather
|
||||
, libhandy
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-clocks";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "34yLBKuS+mGPXe5RGFce+fyeilt5XqAKNcbcZ3ywLaw=";
|
||||
sha256 = "DnEY20oDLjzqMhLZjLuCjWt88i/gXgxfyLORxqPdb+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
vala_0_56
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
@ -48,17 +48,16 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gdk-pixbuf
|
||||
adwaita-icon-theme
|
||||
gnome-desktop
|
||||
geocode-glib
|
||||
geoclue2
|
||||
libgweather
|
||||
gsound
|
||||
libhandy
|
||||
libadwaita
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
@ -81,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Apps/Clocks";
|
||||
description = "Clock application designed for GNOME 3";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, vala_0_56
|
||||
, gettext
|
||||
, itstool
|
||||
, python3
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
, glib
|
||||
, gtk3
|
||||
, libhandy
|
||||
, libsecret
|
||||
, libxml2
|
||||
, gtk-vnc
|
||||
, gtk-frdp
|
||||
|
|
@ -22,18 +23,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-WrmUKPPOn4qDdDK2e3XbxSi5U6QpOotWVE34g0b+VxM=";
|
||||
hash = "sha256-L3s5u0OPS2oM3Jn2JjGpXbI+W7JC7Gg5pMlQKchwJO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
vala_0_56
|
||||
gettext
|
||||
itstool
|
||||
python3
|
||||
|
|
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
|||
gtk-vnc
|
||||
gtk3
|
||||
libhandy
|
||||
libsecret
|
||||
libxml2
|
||||
gtk-frdp
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
|
@ -29,13 +31,22 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "41.4";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-40CxP0b+C31bD48BQTKR3c2HDHSlw4+iTKwfWF5wOT4=";
|
||||
sha256 = "sha256-BUSG03dAc3BqdqmBQXl40VG+O3Ik1yN3W74xbvoked8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not pin to GWeather 3.0, the used API did not change in 4.0.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/759d3087b70341b2c5f1af575ce44338d926690e.patch";
|
||||
sha256 = "Qp9Hta00TLf2lOb9+g9vnPoK17mP3eHpCG2i1ewaw+w=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -78,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
# entry point to the wrapped binary we get back to a wrapped
|
||||
# binary.
|
||||
substituteInPlace "data/org.gnome.Maps.service.in" \
|
||||
--replace "Exec=@pkgdatadir@/org.gnome.Maps" \
|
||||
--replace "Exec=@pkgdatadir@/@app-id@" \
|
||||
"Exec=$out/bin/gnome-maps"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, grilo
|
||||
, grilo-plugins
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtk4
|
||||
, pango
|
||||
, glib
|
||||
, desktop-file-utils
|
||||
|
|
@ -23,21 +23,20 @@
|
|||
, itstool
|
||||
, gnome
|
||||
, gst_all_1
|
||||
, libdazzle
|
||||
, libsoup
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9";
|
||||
sha256 = "nWgZj5hSveD4NFhLlqgSiX0xDLcXKLak8Ji8spsZxdA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -54,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
pango
|
||||
glib
|
||||
libmediaart
|
||||
|
|
@ -66,9 +65,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
grilo
|
||||
grilo-plugins
|
||||
libnotify
|
||||
libdazzle
|
||||
libsoup
|
||||
libhandy
|
||||
libadwaita
|
||||
gsettings-desktop-schemas
|
||||
tracker
|
||||
] ++ (with gst_all_1; [
|
||||
|
|
@ -85,13 +83,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pygobject3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for f in meson_post_conf.py meson_post_install.py; do
|
||||
chmod +x $f
|
||||
patchShebangs $f
|
||||
done
|
||||
'';
|
||||
|
||||
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
|
||||
dontWrapGApps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
|
|
@ -6,7 +7,7 @@
|
|||
, wrapGAppsHook
|
||||
, gjs
|
||||
, glib
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gdk-pixbuf
|
||||
, gst_all_1
|
||||
, gnome
|
||||
|
|
@ -14,16 +15,16 @@
|
|||
, ninja
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, libhandy
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sound-recorder";
|
||||
version = "40.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl";
|
||||
sha256 = "TAjDFSgvPr96LabyDg/58McdqlIp/NL+C1wKqqoG8K0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -40,9 +41,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gjs
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
gdk-pixbuf
|
||||
libhandy
|
||||
libadwaita
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-text-editor";
|
||||
version = "41.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-YZ7FINbgkF1DEWcCTkPc4Nv2o0Xy1IaTUB1w3HYm+GE=";
|
||||
sha256 = "sha256-DjIUDuHBNChWO81feE5h7iL/0a0n2MAig7Q1ioHfq1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -53,14 +53,6 @@ stdenv.mkDerivation rec {
|
|||
pcre
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-text-editor";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
, fetchurl
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gtk3
|
||||
, libhandy
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, wrapGAppsHook
|
||||
, gjs
|
||||
, gobject-introspection
|
||||
|
|
@ -12,18 +12,17 @@
|
|||
, meson
|
||||
, ninja
|
||||
, geoclue2
|
||||
, gnome-desktop
|
||||
, python3
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-weather";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5";
|
||||
sha256 = "V57mkdhT5bs/9Q6Me0P4Wundfls6ZJ4CwlSi2bgHtGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,11 +34,10 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libhandy
|
||||
gtk4
|
||||
libadwaita
|
||||
gjs
|
||||
gobject-introspection
|
||||
gnome-desktop
|
||||
libgweather
|
||||
gnome.adwaita-icon-theme
|
||||
geoclue2
|
||||
|
|
@ -70,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Apps/Weather";
|
||||
description = "Access current weather conditions and forecasts";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,40 @@
|
|||
{ lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme
|
||||
, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
|
||||
, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib
|
||||
, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, itstool
|
||||
, fetchurl
|
||||
, gdk-pixbuf
|
||||
, telepathy-glib
|
||||
, gjs
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, telepathy-idle
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
, pkg-config
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, gtk3
|
||||
, glib
|
||||
, libsecret
|
||||
, libsoup
|
||||
, webkitgtk
|
||||
, gobject-introspection
|
||||
, appstream-glib
|
||||
, gnome
|
||||
, wrapGAppsHook4
|
||||
, telepathy-logger
|
||||
, gspell
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polari";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs=";
|
||||
sha256 = "WPFbv1tCwLASPv3td1cR07DyRJl1cwlAOMpVZGHgSTw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -19,16 +44,38 @@ stdenv.mkDerivation rec {
|
|||
./make-thumbnailer-wrappable.patch
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
|
||||
propagatedUserEnvPkgs = [
|
||||
telepathy-idle
|
||||
telepathy-logger
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2
|
||||
desktop-file-utils gobject-introspection appstream-glib
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
itstool
|
||||
gettext
|
||||
wrapGAppsHook4
|
||||
libxml2
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
|
||||
telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk
|
||||
gtk4
|
||||
libadwaita
|
||||
gtk3 # for thumbnailer
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
telepathy-glib
|
||||
telepathy-logger
|
||||
gjs
|
||||
gspell
|
||||
gdk-pixbuf
|
||||
libsecret
|
||||
libsoup
|
||||
webkitgtk # for thumbnailer
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -46,7 +93,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Apps/Polari";
|
||||
description = "IRC chat client designed to integrate with the GNOME desktop";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adwaita-icon-theme";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro=";
|
||||
sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA=";
|
||||
};
|
||||
|
||||
# For convenience, we can specify adwaita-icon-theme only in packages
|
||||
|
|
|
|||
|
|
@ -8,22 +8,22 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, gtk3
|
||||
, libhandy
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, glib
|
||||
, libxml2
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, itstool
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "baobab";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU=";
|
||||
sha256 = "Sxqr5rqxWCs/6nmigpvOfyQVu25QYvJTV67t1TF6UNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,21 +37,27 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
# Prevents “error: Package `libhandy-1' not found in specified Vala API
|
||||
wrapGAppsHook4
|
||||
# Prevents “error: Package `libadwaita-1' not found in specified Vala API
|
||||
# directories or GObject-Introspection GIR directories” with strictDeps,
|
||||
# even though it should only be a runtime dependency.
|
||||
libhandy
|
||||
libadwaita
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libhandy
|
||||
gtk4
|
||||
libadwaita
|
||||
glib
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
# https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/40
|
||||
substituteInPlace build-aux/post-install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
|
@ -12,9 +12,9 @@
|
|||
, libportal-gtk3
|
||||
, gnome
|
||||
, gtk3
|
||||
, libhandy
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, adwaita-icon-theme
|
||||
, gnome-desktop
|
||||
, lcms2
|
||||
, gdk-pixbuf
|
||||
|
|
@ -24,27 +24,20 @@
|
|||
, librsvg
|
||||
, libexif
|
||||
, gobject-introspection
|
||||
, python3
|
||||
, gi-docgen
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eog";
|
||||
version = "41.1";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-huG5ujnaz3QiavpFermDtBJTuJ9he/VBOcrQiS0C2Kk=";
|
||||
sha256 = "sha256-+zW/tRZ6QhIfWae5t6wNdbvQUXua/W2Rgx6E01c13fg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with latest libportal
|
||||
# https://gitlab.gnome.org/GNOME/eog/-/merge_requests/115
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd.patch";
|
||||
sha256 = "ttcsfHubfmIbxA51YLnxXDagLLNutXYmoQyMQ4sHRak=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -52,15 +45,16 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
itstool
|
||||
wrapGAppsHook
|
||||
libxml2
|
||||
libxml2 # for xmllint for xml-stripblanks
|
||||
gobject-introspection
|
||||
python3
|
||||
gi-docgen
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libportal-gtk3
|
||||
gtk3
|
||||
libhandy
|
||||
gdk-pixbuf
|
||||
glib
|
||||
libpeas
|
||||
|
|
@ -71,13 +65,11 @@ stdenv.mkDerivation rec {
|
|||
exempi
|
||||
gsettings-desktop-schemas
|
||||
shared-mime-info
|
||||
adwaita-icon-theme
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
|
|
@ -88,6 +80,11 @@ stdenv.mkDerivation rec {
|
|||
)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
, icu
|
||||
, wrapGAppsHook
|
||||
, gnome
|
||||
, pantheon
|
||||
, libportal-gtk3
|
||||
, libxml2
|
||||
, libxslt
|
||||
|
|
@ -41,37 +40,23 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "41.3";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ugEmjuVPMY39rC4B66OKP8lpQMHL9kDtJhOuKfi8ua0=";
|
||||
sha256 = "Pb+owA5Ft/ROGCTQHw/r6DcHtfuTMMJhFz9ot/A81eM=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Pantheon specific patches for epiphany
|
||||
# https://github.com/elementary/browser
|
||||
#
|
||||
# Make this respect dark mode settings from Pantheon
|
||||
# https://github.com/elementary/browser/pull/21
|
||||
# https://github.com/elementary/browser/pull/41
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/dark-style.patch";
|
||||
sha256 = "sha256-RzMUc9P51UN3tRFefzRtMniXR9duOOmLj5eu5gL2TEQ=";
|
||||
})
|
||||
# Patch to unlink nav buttons
|
||||
# https://github.com/elementary/browser/pull/18
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch";
|
||||
sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU=";
|
||||
})
|
||||
] ++ [
|
||||
# Fix build with latest libportal
|
||||
# https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1051
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/84474398f6e59266b73170838219aa896729ce93.patch";
|
||||
sha256 = "SeiLTo3FcOxuml5sJX9GqyGdyGf1jm1A76SOI0JJvoo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -94,7 +79,6 @@ stdenv.mkDerivation rec {
|
|||
glib
|
||||
glib-networking
|
||||
gnome-desktop
|
||||
gnome.adwaita-icon-theme
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
|
|
@ -117,8 +101,6 @@ stdenv.mkDerivation rec {
|
|||
p11-kit
|
||||
sqlite
|
||||
webkitgtk
|
||||
] ++ lib.optionals withPantheon [
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
# Tests need an X display
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -32,42 +31,27 @@
|
|||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, pantheon
|
||||
, python3
|
||||
, texlive
|
||||
, t1lib
|
||||
, gst_all_1
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, gi-docgen
|
||||
, supportMultimedia ? true # PDF multimedia
|
||||
, libgxps
|
||||
, supportXPS ? true # Open XML Paper Specification via libgxps
|
||||
, withPantheon ? false
|
||||
, withLibsecret ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evince";
|
||||
version = "41.4";
|
||||
version = "42.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "/yRSQPIwkivsMqTXsKHZGyR6g9E0hPmbdANdUesjITA=";
|
||||
sha256 = "skdnuz1RA7TjWw4VzwM9viSI+IcAzdiC0ipDre7C6Ao=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Make this respect dark mode settings from Pantheon
|
||||
# https://github.com/elementary/evince/pull/21
|
||||
# https://github.com/elementary/evince/pull/31
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch";
|
||||
sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
|
|
@ -75,11 +59,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
gettext
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
gi-docgen
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -108,7 +90,6 @@ stdenv.mkDerivation rec {
|
|||
libxml2
|
||||
pango
|
||||
poppler
|
||||
t1lib
|
||||
texlive.bin.core # kpathsea for DVI support
|
||||
] ++ lib.optionals withLibsecret [
|
||||
libsecret
|
||||
|
|
@ -121,9 +102,7 @@ stdenv.mkDerivation rec {
|
|||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
]) ++ lib.optionals withPantheon [
|
||||
pantheon.granite
|
||||
];
|
||||
]);
|
||||
|
||||
mesonFlags = [
|
||||
"-Dnautilus=false"
|
||||
|
|
@ -140,6 +119,11 @@ stdenv.mkDerivation rec {
|
|||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,57 @@
|
|||
{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection
|
||||
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit
|
||||
, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja
|
||||
, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber
|
||||
, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, gnome
|
||||
, python3
|
||||
, gobject-introspection
|
||||
, gettext
|
||||
, libsoup
|
||||
, libxml2
|
||||
, libsecret
|
||||
, icu
|
||||
, sqlite
|
||||
, tzdata
|
||||
, libcanberra-gtk3
|
||||
, gcr
|
||||
, p11-kit
|
||||
, db
|
||||
, nspr
|
||||
, nss
|
||||
, libical
|
||||
, gperf
|
||||
, wrapGAppsHook
|
||||
, glib-networking
|
||||
, pcre
|
||||
, vala
|
||||
, cmake
|
||||
, ninja
|
||||
, libkrb5
|
||||
, openldap
|
||||
, webkitgtk
|
||||
, libaccounts-glib
|
||||
, json-glib
|
||||
, glib
|
||||
, gtk3
|
||||
, libphonenumber
|
||||
, gnome-online-accounts
|
||||
, libgweather
|
||||
, libgdata
|
||||
, gsettings-desktop-schemas
|
||||
, boost
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.42.4";
|
||||
version = "3.44.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "fftBs+bAWBHUSajeTfx3q5sZ+O3yCzL92FeRhmIm0lI=";
|
||||
sha256 = "DYiBtcUeG5F2GxlF2yZKRqq/VKc+6hyo9EiyB4FdWC4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -23,19 +62,47 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
prePatch = ''
|
||||
substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
|
||||
substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \
|
||||
--subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
|
||||
--subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas}
|
||||
patches="$patches $PWD/hardcode-gsettings.patch"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
python3
|
||||
gperf
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib libsoup libxml2 gtk3 gnome-online-accounts
|
||||
gcr p11-kit libgweather libgdata libaccounts-glib json-glib
|
||||
icu sqlite libkrb5 openldap webkitgtk glib-networking
|
||||
libcanberra-gtk3 pcre libphonenumber boost protobuf
|
||||
glib
|
||||
libsoup
|
||||
libxml2
|
||||
gtk3
|
||||
gnome-online-accounts
|
||||
gcr
|
||||
p11-kit
|
||||
libgweather
|
||||
libgdata
|
||||
libaccounts-glib
|
||||
json-glib
|
||||
icu
|
||||
sqlite
|
||||
libkrb5
|
||||
openldap
|
||||
webkitgtk
|
||||
glib-networking
|
||||
libcanberra-gtk3
|
||||
pcre
|
||||
libphonenumber
|
||||
boost
|
||||
protobuf
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -55,6 +122,7 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
|
||||
"-DWITH_PHONENUMBER=ON"
|
||||
"-DWITH_GWEATHER4=ON"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
@ -67,7 +135,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Unified backend for programs that work with contacts, tasks, and calendar information";
|
||||
homepage = "https://wiki.gnome.org/Apps/Evolution";
|
||||
license = licenses.lgpl2;
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
, gtk3
|
||||
, libcanberra-gtk3
|
||||
, pam
|
||||
, libgudev
|
||||
, libselinux
|
||||
, keyutils
|
||||
, audit
|
||||
|
|
@ -43,13 +44,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdm";
|
||||
version = "41.3";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "uwtlCnzqkPCaMyhPvQKXUxVAfvwY6BQAmFLRvK00N9Q=";
|
||||
sha256 = "oyisl2k3vsF5lx/weCmhJGuYznJBgcEorjKguketOFU=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
|
|||
keyutils
|
||||
libX11
|
||||
libcanberra-gtk3
|
||||
libgudev
|
||||
libselinux
|
||||
pam
|
||||
plymouth
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-backgrounds";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; };
|
||||
sha256 = "TH/hoJ9FnF93GJpZglJPzgXYiJRJVdZ5kQ8jRgbBKV0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -20,9 +22,22 @@ stdenv.mkDerivation rec {
|
|||
./stable-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-backgrounds";
|
||||
attrPath = "gnome.gnome-backgrounds";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Default wallpaper set for GNOME";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds";
|
||||
license = licenses.cc-by-sa-30;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,15 +5,17 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, gettext
|
||||
, glib
|
||||
, udev
|
||||
, upower
|
||||
, itstool
|
||||
, libxml2
|
||||
, wrapGAppsHook
|
||||
, libnotify
|
||||
, libcanberra-gtk3
|
||||
, gsound
|
||||
, gobject-introspection
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
|
|
@ -24,14 +26,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-bluetooth";
|
||||
version = "3.34.5";
|
||||
version = "42.0";
|
||||
|
||||
# TODO: split out "lib"
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "PR4nIGc7yaJCYZ3F0jH9bndsGKSdop9DzcQzBVrbAXA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -51,24 +53,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
libadwaita
|
||||
udev
|
||||
upower
|
||||
libnotify
|
||||
libcanberra-gtk3
|
||||
gnome.adwaita-icon-theme
|
||||
gsound
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dicon_update=false"
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
@ -77,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-bluetooth";
|
||||
description = "Application that lets you manage Bluetooth in the GNOME desktop";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -8,29 +8,28 @@
|
|||
, fetchurl
|
||||
, pkg-config
|
||||
, libxml2
|
||||
, gtk3
|
||||
, gtk4
|
||||
, glib
|
||||
, gtksourceview4
|
||||
, gtksourceview5
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, python3
|
||||
, gnome
|
||||
, mpfr
|
||||
, gmp
|
||||
, libsoup
|
||||
, libmpc
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, gsettings-desktop-schemas
|
||||
, libgee
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calculator";
|
||||
version = "41.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "AmdhSv2yXTi3hBG0Lrq3vFDBtjQMxJu2jA5DLX3fijQ=";
|
||||
sha256 = "pTWhTr6ljmkaS1oIUlau0GCiw/BzhKw6PQGDIzKifko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,32 +40,25 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
itstool
|
||||
wrapGAppsHook
|
||||
python3
|
||||
gobject-introspection # for finding vapi files
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
glib
|
||||
libxml2
|
||||
gtksourceview4
|
||||
gtksourceview5
|
||||
mpfr
|
||||
gmp
|
||||
gnome.adwaita-icon-theme
|
||||
libgee
|
||||
gsettings-desktop-schemas
|
||||
libsoup
|
||||
libmpc
|
||||
libhandy
|
||||
libadwaita
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Currency conversion test tries to store currency data in $HOME/.cache.
|
||||
export HOME=$TMPDIR
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-color-manager";
|
||||
version = "3.32.0";
|
||||
version = "3.36.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
|
||||
sha256 = "nduea2Ry4RmAE4H5CQUzLsHUJYmBchu6gxyiRs6zrTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,16 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, gettext
|
||||
, fetchurl
|
||||
, evolution-data-server
|
||||
, pkg-config
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_42
|
||||
, python3
|
||||
, gtk3
|
||||
, desktop-file-utils
|
||||
, gtk4
|
||||
, glib
|
||||
, cheese
|
||||
, libchamplain
|
||||
, clutter-gtk
|
||||
, geocode-glib
|
||||
, libportal
|
||||
, gnome-desktop
|
||||
, gnome-online-accounts
|
||||
, wrapGAppsHook
|
||||
|
|
@ -23,17 +21,17 @@
|
|||
, vala
|
||||
, meson
|
||||
, ninja
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-contacts";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA=";
|
||||
sha256 = "iALDj9wj9SjawSj1O9zx9sow4OHGhIxCzWyEpeIsUhY=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
|
@ -47,34 +45,25 @@ stdenv.mkDerivation rec {
|
|||
vala
|
||||
gettext
|
||||
libxslt
|
||||
docbook_xsl
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_42
|
||||
python3
|
||||
desktop-file-utils
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
glib
|
||||
libportal
|
||||
evolution-data-server
|
||||
gsettings-desktop-schemas
|
||||
folks
|
||||
gnome-desktop
|
||||
libhandy
|
||||
libadwaita
|
||||
libxml2
|
||||
gnome-online-accounts
|
||||
cheese
|
||||
gnome.adwaita-icon-theme
|
||||
libchamplain
|
||||
clutter-gtk
|
||||
geocode-glib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,8 @@
|
|||
, substituteAll
|
||||
, accountsservice
|
||||
, adwaita-icon-theme
|
||||
, cheese
|
||||
, clutter
|
||||
, clutter-gtk
|
||||
, colord
|
||||
, colord-gtk
|
||||
, colord-gtk4
|
||||
, cups
|
||||
, docbook-xsl-nons
|
||||
, fontconfig
|
||||
|
|
@ -26,19 +23,17 @@
|
|||
, gnome
|
||||
, gsettings-desktop-schemas
|
||||
, gsound
|
||||
, gtk3
|
||||
, gtk4
|
||||
, ibus
|
||||
, libcanberra-gtk3
|
||||
, libgnomekbd
|
||||
, libgtop
|
||||
, libgudev
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, libkrb5
|
||||
, libpulseaudio
|
||||
, libpwquality
|
||||
, librsvg
|
||||
, libsecret
|
||||
, libsoup
|
||||
, libwacom
|
||||
, libxml2
|
||||
, libxslt
|
||||
|
|
@ -47,7 +42,7 @@
|
|||
, mutter
|
||||
, networkmanager
|
||||
, networkmanagerapplet
|
||||
, libnma
|
||||
, libnma-gtk4
|
||||
, ninja
|
||||
, pkg-config
|
||||
, polkit
|
||||
|
|
@ -68,11 +63,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "41.4";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-1tsMTLcIV77PSKxQB/ErX2O51dfoDqfuV9O+USZp98k=";
|
||||
sha256 = "sha256-BzLvp8QXHOCg7UEGWAtM41pXsQFSwOo20jkTSRN3fto=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -100,11 +95,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
accountsservice
|
||||
adwaita-icon-theme
|
||||
cheese
|
||||
clutter
|
||||
clutter-gtk
|
||||
colord
|
||||
colord-gtk
|
||||
colord-gtk4
|
||||
libepoxy
|
||||
fontconfig
|
||||
gdk-pixbuf
|
||||
|
|
@ -119,19 +111,17 @@ stdenv.mkDerivation rec {
|
|||
gnome-user-share # optional, sharing panel
|
||||
gsettings-desktop-schemas
|
||||
gsound
|
||||
gtk3
|
||||
gtk4
|
||||
ibus
|
||||
libcanberra-gtk3
|
||||
libgtop
|
||||
libgudev
|
||||
libhandy
|
||||
libadwaita
|
||||
libkrb5
|
||||
libnma
|
||||
libnma-gtk4
|
||||
libpulseaudio
|
||||
libpwquality
|
||||
librsvg
|
||||
libsecret
|
||||
libsoup
|
||||
libwacom
|
||||
libxml2
|
||||
modemmanager
|
||||
|
|
@ -145,9 +135,19 @@ stdenv.mkDerivation rec {
|
|||
upower
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs build-aux/meson/meson_post_install.py
|
||||
# postPatch = ''
|
||||
# scriptsToPatch=(
|
||||
# build-aux/meson/meson_post_install.py
|
||||
# build-aux/meson/find_xdg_file.py
|
||||
# )
|
||||
# # # patchShebangs requires executable file
|
||||
# # chmod +x "''${scriptsToPatch[@]}"
|
||||
# # patchShebangs "''${scriptsToPatch[@]}"
|
||||
# '';
|
||||
|
||||
preConfigure = ''
|
||||
# For ITS rules
|
||||
addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-disk-utility";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8=";
|
||||
sha256 = "sha256-G2VkRU1nQmMiyzv8WlVYZTv8ff7qKuCCWx0IYp8BCQs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,47 @@
|
|||
{ lib, stdenv, meson, ninja, gettext, fetchurl
|
||||
, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy
|
||||
, wrapGAppsHook, gnome, harfbuzz }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gtk4
|
||||
, glib
|
||||
, libxml2
|
||||
, gnome-desktop
|
||||
, libadwaita
|
||||
, wrapGAppsHook4
|
||||
, gnome
|
||||
, harfbuzz
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-font-viewer";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY=";
|
||||
sha256 = "z6K43/8hoQWhoCHa36IT8TYn5qF5p3x7Wf3O2sqEjcw=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ];
|
||||
buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
wrapGAppsHook4
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
glib
|
||||
gnome-desktop
|
||||
harfbuzz
|
||||
libadwaita
|
||||
];
|
||||
|
||||
# Do not run meson-postinstall.sh
|
||||
preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
|
||||
|
|
@ -28,8 +55,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Program that can preview fonts and create thumbnails for fonts";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-font-viewer";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
, polkit
|
||||
, webkitgtk
|
||||
, systemd
|
||||
, libhandy
|
||||
, libnma
|
||||
, tzdata
|
||||
, libgnomekbd
|
||||
|
|
@ -35,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "41.4";
|
||||
version = "42.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "luzS2252xROxjGBtwmK7UjIoxKrtvtageBHlaP1dtkI=";
|
||||
sha256 = "/PQ/L75NwEw6wq5QVjP+se8w2nDKleq8YeIAaxkuXlU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -72,6 +73,7 @@ stdenv.mkDerivation rec {
|
|||
json-glib
|
||||
krb5
|
||||
libgweather
|
||||
libhandy
|
||||
libnma
|
||||
libpwquality
|
||||
librest
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
, python3
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, libepoxy
|
||||
, libdrm
|
||||
, nv-codec-headers-11
|
||||
, pipewire
|
||||
, systemd
|
||||
|
|
@ -17,16 +19,20 @@
|
|||
, gdk-pixbuf
|
||||
, freerdp
|
||||
, fuse3
|
||||
, mesa
|
||||
, libgudev
|
||||
, xvfb-run
|
||||
, dbus
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-remote-desktop";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-EBUeabZIwiR8XjPZou9Bn04DfuWyuuSebtasp36xulg=";
|
||||
hash = "sha256-s9wrt1x4Pe2quWqNu6wW3ZqhOebTooo9s+pAxgRluY8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,6 +49,8 @@ stdenv.mkDerivation rec {
|
|||
fuse3
|
||||
gdk-pixbuf # For libnotify
|
||||
glib
|
||||
libepoxy
|
||||
libdrm
|
||||
nv-codec-headers-11
|
||||
libnotify
|
||||
libsecret
|
||||
|
|
@ -50,17 +58,35 @@ stdenv.mkDerivation rec {
|
|||
libxkbcommon
|
||||
pipewire
|
||||
systemd
|
||||
];
|
||||
] ++ checkInputs;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
checkInputs = [
|
||||
mesa # for gbm
|
||||
libgudev
|
||||
xvfb-run
|
||||
python3.pkgs.dbus-python
|
||||
python3.pkgs.pygobject3
|
||||
dbus # for dbus-run-session
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
|
||||
# Too deep of a rabbit hole.
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs \
|
||||
tests/vnc-test-runner.sh \
|
||||
tests/run-vnc-tests.py \
|
||||
meson_post_install.py
|
||||
|
||||
substituteInPlace tests/vnc-test-runner.sh \
|
||||
--replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session-ctl";
|
||||
version = "41.3";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-aC0tkTf2lgCRlcbFj1FEOVBm3YUuP+8Yz98W3ZjUydg=";
|
||||
hash = "sha256-XGJVmlxqbJ/1frbzn2TI7BJm449xeLk43xMMqFsLYko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session";
|
||||
# Also bump ./ctl.nix when bumping major version.
|
||||
version = "41.3";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "sessions" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "7koikFP1ImJAVIiWCTNbiFKHz2e73g3J/YgrAeybWzk=";
|
||||
sha256 = "PMoGBTq2gpJpIJUafalfjMbXLadMaCxG0KBlMzKWnKo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -83,6 +83,16 @@ stdenv.mkDerivation rec {
|
|||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
|
||||
sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";
|
||||
})
|
||||
|
||||
# Port to gweather4
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch";
|
||||
sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch";
|
||||
sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "41.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ=";
|
||||
sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extensions";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "rZuoL0y9BHJpc7XoevrRiv2qMjhgoK8+ckDzp00iLxk=";
|
||||
sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
, evolution-data-server
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, sassc
|
||||
, systemd
|
||||
, pipewire
|
||||
|
|
@ -66,13 +67,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "41.4";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "x+73SvMEZJwDuG25m9C6x1oBH7/2d0yO41WD282tivQ=";
|
||||
sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -118,7 +119,6 @@ stdenv.mkDerivation rec {
|
|||
sassc
|
||||
desktop-file-utils
|
||||
libxslt.bin
|
||||
python3
|
||||
asciidoc
|
||||
];
|
||||
|
||||
|
|
@ -142,6 +142,7 @@ stdenv.mkDerivation rec {
|
|||
libical
|
||||
gtk3
|
||||
gtk4
|
||||
libadwaita
|
||||
gdm
|
||||
geoclue2
|
||||
adwaita-icon-theme
|
||||
|
|
@ -169,6 +170,9 @@ stdenv.mkDerivation rec {
|
|||
bash-completion
|
||||
gnome-autoar
|
||||
json-glib
|
||||
|
||||
# for tools
|
||||
pythonEnv
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -177,14 +181,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
patchShebangs src/data-to-c.pl
|
||||
chmod +x meson/postinstall.py
|
||||
patchShebangs meson/postinstall.py
|
||||
|
||||
# We can generate it ourselves.
|
||||
rm -f man/gnome-shell.1
|
||||
|
||||
substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
|
||||
substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 524166102..100b81a63
|
||||
index 524166102..6d0722a1c
|
||||
--- a/js/dbusServices/dbus-service.in
|
||||
+++ b/js/dbusServices/dbus-service.in
|
||||
@@ -1,3 +1,9 @@
|
||||
|
|
@ -24,18 +24,18 @@ index 3b0d09abe..4fd4bb66d 100644
|
|||
-Exec=@gjs@ @pkgdatadir@/@service@
|
||||
+Exec=@pkgdatadir@/@service@
|
||||
diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
|
||||
index c749f45dc..11bcb0c9e 100644
|
||||
index eb941ed90..552051e5a 100644
|
||||
--- a/js/dbusServices/meson.build
|
||||
+++ b/js/dbusServices/meson.build
|
||||
@@ -2,6 +2,7 @@ launcherconf = configuration_data()
|
||||
launcherconf.set('PACKAGE_NAME', meson.project_name())
|
||||
launcherconf.set('prefix', prefix)
|
||||
launcherconf.set('libdir', libdir)
|
||||
+launcherconf.set('gjs', gjs.path())
|
||||
+launcherconf.set('gjs', gjs.full_path())
|
||||
|
||||
dbus_services = {
|
||||
'org.gnome.Shell.Extensions': 'extensions',
|
||||
@@ -11,16 +12,17 @@ dbus_services = {
|
||||
@@ -18,16 +19,17 @@ endif
|
||||
config_dir = '@0@/..'.format(meson.current_build_dir())
|
||||
|
||||
foreach service, dir : dbus_services
|
||||
|
|
@ -51,7 +51,7 @@ index c749f45dc..11bcb0c9e 100644
|
|||
|
||||
serviceconf = configuration_data()
|
||||
serviceconf.set('service', service)
|
||||
- serviceconf.set('gjs', gjs.path())
|
||||
- serviceconf.set('gjs', gjs.full_path())
|
||||
serviceconf.set('pkgdatadir', pkgdatadir)
|
||||
|
||||
configure_file(
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, glib
|
||||
, appstream
|
||||
, libsoup
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, polkit
|
||||
, isocodes
|
||||
, gspell
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
, gobject-introspection
|
||||
, flatpak
|
||||
, fwupd
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, libxmlb
|
||||
|
|
@ -42,11 +42,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "41.4";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "evhzzkcs8racUbyevGG4Nt+8z9b0Jwbj7TqpCaruxGU=";
|
||||
sha256 = "QsaF4u95li6zCo6VjHA8mh899zFQQiOgYos7Yk733B4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -73,12 +73,12 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
glib
|
||||
packagekit
|
||||
appstream
|
||||
libsoup
|
||||
libhandy
|
||||
libadwaita
|
||||
gsettings-desktop-schemas
|
||||
gnome-desktop
|
||||
gspell
|
||||
|
|
@ -97,6 +97,8 @@ stdenv.mkDerivation rec {
|
|||
"-Dgudev=false"
|
||||
# FIXME: package malcontent parental controls
|
||||
"-Dmalcontent=false"
|
||||
# Needs flatpak to upgrade
|
||||
"-Dsoup2=true"
|
||||
] ++ lib.optionals (!withFwupd) [
|
||||
"-Dfwupd=false"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
, wrapGAppsHook
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, gsettings-desktop-schemas
|
||||
, itstool
|
||||
, gnome
|
||||
|
|
@ -24,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-system-monitor";
|
||||
version = "41.0";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8=";
|
||||
sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
|
|||
wrapGAppsHook
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -58,12 +56,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-system-monitor";
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-terminal";
|
||||
version = "3.42.2";
|
||||
version = "3.43.90";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ipyOXvejpzskapR+EZC7COyYk1r4YM8LOqL79GBoF6A=";
|
||||
sha256 = "pQpyOodNNkoP78GfmU2IVUWqYKUdaBimL/kPgv9TydY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ninja
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtk4
|
||||
, glib
|
||||
, gdk-pixbuf
|
||||
, desktop-file-utils
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
, wrapGAppsHook
|
||||
, python3
|
||||
, gnome
|
||||
, libhandy
|
||||
, libadwaita
|
||||
, librsvg
|
||||
, rustc
|
||||
, cargo
|
||||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-tour";
|
||||
version = "40.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-rYYS110B7qY8WcmY65KOvm75mEZgYbn8H97IKF02M5g=";
|
||||
hash = "sha256-/PGsaJBX2oZZaXDsPag1VSHApy6VBj6wWdX+5N6oL08=";
|
||||
};
|
||||
|
||||
cargoVendorDir = "vendor";
|
||||
|
|
@ -49,16 +49,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libhandy
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@
|
|||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "41.4";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "VYgmlQZKpvA4XNH39/qywqLtLJrsePV4+qB/UgnKUpw=";
|
||||
sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -136,7 +136,7 @@ let self = stdenv.mkDerivation rec {
|
|||
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||
|
||||
passthru = {
|
||||
libdir = "${self}/lib/mutter-9";
|
||||
libdir = "${self}/lib/mutter-10";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nautilus";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "hyKFscQKbuQYzile0RX1Qn2nCQfYItlbz1FnXVSYgis=";
|
||||
sha256 = "PJBPM7otKgeIkr7ir3FITNYIkjzXjsfooVF7whVRE9U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -53,17 +53,6 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
inherit tracker;
|
||||
})
|
||||
|
||||
# Fix build with latest libportal
|
||||
# https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/749
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/55cfd66ccca391fc144f5863ff6bfc1f3b137e2d.patch";
|
||||
sha256 = "xSb9l7xxEYpAwmdmeWT/t7Z9Ck3DPtsODzbReQW/Q70=";
|
||||
excludes = [
|
||||
"build-aux/flatpak/org.gnome.Nautilus.json"
|
||||
"build-aux/flatpak/org.gnome.Nautilus.yml"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "40.7";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-fFUYUsta99NKqYn4rV7ePL4xgoz43VrsKytv3NGsPVM=";
|
||||
sha256 = "sha256-rB+Fev0LyIl90gRQI618VxPlzu/KVrCzzF6aR5UylYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
, ninja
|
||||
, gettext
|
||||
, gst_all_1
|
||||
, clutter-gtk
|
||||
, clutter-gst
|
||||
, python3Packages
|
||||
, shared-mime-info
|
||||
, pkg-config
|
||||
|
|
@ -21,6 +19,7 @@
|
|||
, grilo
|
||||
, grilo-plugins
|
||||
, libpeas
|
||||
, libhandy
|
||||
, adwaita-icon-theme
|
||||
, gnome-desktop
|
||||
, gsettings-desktop-schemas
|
||||
|
|
@ -30,11 +29,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "totem";
|
||||
version = "3.38.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA=";
|
||||
url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "SvBJHduV34szruOZ06UPnHqxfeiNOvYzVlZ8+I9X5qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -53,17 +52,16 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
glib
|
||||
grilo
|
||||
clutter-gtk
|
||||
clutter-gst
|
||||
totem-pl-parser
|
||||
grilo-plugins
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-libav
|
||||
libpeas
|
||||
libhandy
|
||||
shared-mime-info
|
||||
gdk-pixbuf
|
||||
libxml2
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp-xsl";
|
||||
version = "41.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DW2zesLvgSSD4BBHA/H6nPAy6eCVal8cOvvMI3kfilQ=";
|
||||
sha256 = "sha256-KbJzzAvRbvtumDRDgD8en9wDUR5cT/Y0j9MKYE1NyEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, webkitgtk
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, libhandy
|
||||
, glib
|
||||
, gnome
|
||||
, sqlite
|
||||
|
|
@ -17,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-sAvwM/At15ttPyVQMccd+NbtOOVSyHC485GjdHJMQ8U=";
|
||||
sha256 = "sha256-IIglVqnF29MHWTAkXnA3HGusMOqnpe0Jx9sSfNogE/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libhandy
|
||||
glib
|
||||
webkitgtk
|
||||
sqlite
|
||||
|
|
|
|||
|
|
@ -58,8 +58,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
gnome-common = callPackage ./core/gnome-common { };
|
||||
|
||||
gnome-desktop = callPackage ./core/gnome-desktop { };
|
||||
|
||||
gnome-dictionary = callPackage ./core/gnome-dictionary { };
|
||||
|
||||
gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
|
||||
|
|
@ -281,6 +279,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
}) // lib.optionalAttrs (config.allowAliases or true) {
|
||||
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
||||
|
||||
gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
|
||||
libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19
|
||||
|
||||
bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26
|
||||
|
|
@ -289,7 +288,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
glib_networking = throw "The ‘gnome.glib_networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2018-02-25
|
||||
gnome_common = throw "The ‘gnome.gnome_common’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-common’ directly."; # added 2018-02-25
|
||||
gnome_control_center = throw "The ‘gnome.gnome_control_center’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-control-center’ directly."; # added 2018-02-25
|
||||
gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-desktop’ directly."; # added 2018-02-25
|
||||
gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use pkgs.gnome-desktop’ directly."; # added 2018-02-25
|
||||
gnome_keyring = throw "The ‘gnome.gnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-keyring’ directly."; # added 2018-02-25
|
||||
gnome_online_accounts = throw "The ‘gnome.gnome_online_accounts’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-online-accounts’ directly."; # added 2018-02-25
|
||||
gnome_session = throw "The ‘gnome.gnome_session’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-session’ directly."; # added 2018-02-25
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ in rec {
|
|||
gnome41Extensions = mapUuidNames (produceExtensionsList "41");
|
||||
gnome42Extensions = mapUuidNames (produceExtensionsList "42");
|
||||
|
||||
gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions) [
|
||||
gnomeExtensions = lib.trivial.pipe (gnome41Extensions // gnome42Extensions) [
|
||||
# Apply some custom patches for automatically packaged extensions
|
||||
(callPackage ./extensionOverrides.nix {})
|
||||
# Add all manually packaged extensions
|
||||
|
|
|
|||
|
|
@ -19,15 +19,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-gsconnect";
|
||||
version = "48";
|
||||
version = "53";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
owner = "GSConnect";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U=";
|
||||
sha256 = "sha256-u14OVv3iyQbLEmqLgMdEUD2iC4nsYVCOr4ua66T3TBk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "KDE Connect implementation for Gnome Shell";
|
||||
homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki";
|
||||
homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
|
|
@ -9,8 +10,7 @@
|
|||
, librsvg
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
, pysolfc
|
||||
, guile
|
||||
, guile_3_0
|
||||
, libcanberra-gtk3
|
||||
, ninja
|
||||
, appstream-glib
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aisleriot";
|
||||
version = "3.22.20";
|
||||
version = "3.22.21";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5xFwlhT9qjtvNDQ8kfGd2BeK2KcJDzpfsEC8z4Ei3ns=";
|
||||
sha256 = "sha256-dpzuePxSoJcwUlj314r5G9A8aF1Yz49r+DxNTfA8/Ks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,9 +44,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gtk3
|
||||
librsvg
|
||||
guile
|
||||
guile_3_0
|
||||
libcanberra-gtk3
|
||||
pysolfc
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -14,16 +14,17 @@
|
|||
, gnome
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, librsvg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-chess";
|
||||
version = "41.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "62GYhlljlrQDOj8oo8LjAEtU6+Gzi0DWQiwXufLMF9A=";
|
||||
sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,8 +43,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sudoku";
|
||||
version = "40.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "NhIFMePHE5WB6jgA+/48KzFpTEQBRezIl6w05WLXVKM=";
|
||||
sha256 = "HS603bgCa0Q2Rc81hbjfEkTjgo7hwHUYBSslmeHFwo8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tali";
|
||||
version = "40.5";
|
||||
version = "40.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI=";
|
||||
sha256 = "g/ugR+3s0ZbTBxmnDi9NCYa7Jswr1flVoKkgDqY/BhI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-applets";
|
||||
version = "3.42.0";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "/RaXR7kv7/Rs05/mLyPd+WZ8EAaPRigDOF0TjvxIedQ=";
|
||||
sha256 = "MDlifKknGeSAWH1yT0aXEJw9Em7BUPFPOy4Gkk2576c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "gnome-flashback";
|
||||
version = "3.42.1";
|
||||
version = "3.44.0";
|
||||
|
||||
# From data/sessions/Makefile.am
|
||||
requiredComponentsCommon = enableGnomePanel:
|
||||
|
|
@ -61,7 +61,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "sha256:0kl4m05whm03m2v0y3jd69lghkggn8s0hxdhvchcas7jmhh940n8";
|
||||
sha256 = "sha256-HfCDgSfGJG7s2J0cUP+I/IKr9t47MGjlLd5JWkK9VQo=";
|
||||
};
|
||||
|
||||
# make .desktop Execs absolute
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-panel";
|
||||
version = "3.42.0";
|
||||
version = "3.44.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-rqjA78LtuiDpetRpUXnNCiU45kwpBHAsyMWU6OCJhwM=";
|
||||
hash = "sha256-mWVfddAxh2wTDtI8TaIsCZ57zEBIsCVaPDo7vHh7Mao=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, gettext
|
||||
, glib
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
|
|
@ -20,13 +21,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-tweaks";
|
||||
version = "40.10";
|
||||
version = "42.beta";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "z/07M6OZV3+7RJHOj70C9UxZJPEFbzARTo1CApDvI/w=";
|
||||
sha256 = "g/RMwdyK3HcM2tcXtAPLmmzDwN5Q445vHmeLQ0Aa2Gg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,7 +44,7 @@ python3Packages.buildPythonApplication rec {
|
|||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome.gnome-desktop
|
||||
gnome-desktop
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.gnome-shell
|
||||
# Makes it possible to select user themes through the `user-theme` extension
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, appstream-glib
|
||||
|
|
@ -7,6 +8,8 @@
|
|||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, meson
|
||||
, mutter
|
||||
, ninja
|
||||
|
|
@ -17,14 +20,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.42.6";
|
||||
version = "42.0";
|
||||
pname = "gpaste";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keruspe";
|
||||
repo = "GPaste";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dCeNWdHj3bBGJR1VpJtQjSn601Vdl3f9FjHAPB2wuhE=";
|
||||
sha256 = "sha256-dwL06BL6P8fqvAfrYpifqMAh6d+3Er6RhUeP6nfCr1M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
--subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
|
||||
substituteInPlace src/gnome-shell/prefs.js \
|
||||
--subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
|
||||
substituteInPlace src/libgpaste/settings/gpaste-settings.c \
|
||||
substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \
|
||||
--subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
|
||||
'';
|
||||
|
||||
|
|
@ -57,6 +60,8 @@ stdenv.mkDerivation rec {
|
|||
gjs
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
libadwaita
|
||||
mutter
|
||||
pango
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js
|
||||
index c8773fd6..9efbed67 100644
|
||||
--- a/src/gnome-shell/extension.js
|
||||
+++ b/src/gnome-shell/extension.js
|
||||
@@ -6,6 +6,8 @@
|
||||
|
|
@ -8,21 +10,25 @@
|
|||
+
|
||||
imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
|
||||
imports.gi.versions.GLib = '2.0';
|
||||
imports.gi.versions.GPaste = '1.0';
|
||||
imports.gi.versions.GPaste = '2';
|
||||
diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js
|
||||
index 32244ab2..74b85572 100644
|
||||
--- a/src/gnome-shell/prefs.js
|
||||
+++ b/src/gnome-shell/prefs.js
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
const Gettext = imports.gettext;
|
||||
imports.gi.versions.GPasteGtk = '4';
|
||||
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
|
||||
+
|
||||
//const { GPaste } = imports.gi;
|
||||
|
||||
const ExtensionUtils = imports.misc.extensionUtils;
|
||||
--- a/src/libgpaste/settings/gpaste-settings.c
|
||||
+++ b/src/libgpaste/settings/gpaste-settings.c
|
||||
@@ -1013,7 +1013,11 @@
|
||||
|
||||
const { GPasteGtk } = imports.gi;
|
||||
diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c
|
||||
index 7e53eb64..57c399fc 100644
|
||||
--- a/src/libgpaste/gpaste/gpaste-settings.c
|
||||
+++ b/src/libgpaste/gpaste/gpaste-settings.c
|
||||
@@ -1013,7 +1013,11 @@ create_g_settings (void)
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metacity";
|
||||
version = "3.42.0";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "2J1nnc/tm17vGPBuLcszp6tUPVOzWPqJzmVZPCMe7rw=";
|
||||
sha256 = "GcPF150hcfRbqg9jLMiZX4YHvxIxoWAUQ5usm6Flp8A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -22,11 +22,16 @@ mkDerivation rec {
|
|||
sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21";
|
||||
};
|
||||
|
||||
# Nix clang on darwin identifies as 'Clang', not 'AppleClang'
|
||||
# Without this, dependants fail to link.
|
||||
postPatch = ''
|
||||
# Nix clang on darwin identifies as 'Clang', not 'AppleClang'
|
||||
# Without this, dependants fail to link.
|
||||
substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
|
||||
--replace AppleClang Clang
|
||||
|
||||
# GLib 2.72 moved the file from gio-unix-2.0 to gio-2.0.
|
||||
# https://github.com/lxqt/lxqt-build-tools/pull/74
|
||||
substituteInPlace cmake/find-modules/FindGLIB.cmake \
|
||||
--replace gio/gunixconnection.h gio/gunixfdlist.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -83,10 +83,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
epiphany = pkgs.epiphany.override { withPantheon = true; };
|
||||
|
||||
evince = pkgs.evince.override { withPantheon = true; };
|
||||
|
||||
file-roller = pkgs.gnome.file-roller.override { withPantheon = true; };
|
||||
|
||||
sideload = callPackage ./apps/sideload { };
|
||||
|
||||
#### DESKTOP
|
||||
|
|
@ -109,9 +105,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
inherit (gnome) file-roller;
|
||||
};
|
||||
|
||||
gala = callPackage ./desktop/gala {
|
||||
inherit (gnome) gnome-desktop;
|
||||
};
|
||||
gala = callPackage ./desktop/gala { };
|
||||
|
||||
gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract {
|
||||
inherit (gnome) gnome-bluetooth;
|
||||
|
|
@ -199,9 +193,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { };
|
||||
|
||||
switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell {
|
||||
inherit (gnome) gnome-desktop;
|
||||
};
|
||||
switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { };
|
||||
|
||||
switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { };
|
||||
|
||||
|
|
@ -246,8 +238,12 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21
|
||||
|
||||
evince = pkgs.gnome.evince; # added 2022-03-18
|
||||
|
||||
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
|
||||
|
||||
file-roller = pkgs.gnome.file-roller; # added 2022-03-12
|
||||
|
||||
notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,5 +49,8 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
# sendto device selection is removed in gnome-bluetooth 42
|
||||
# https://github.com/elementary/gnome-bluetooth-contract/issues/1
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ let
|
|||
|
||||
"0.54" = ./disable-graphviz-0.46.1.patch;
|
||||
|
||||
"0.56" = ./disable-graphviz-0.46.1.patch;
|
||||
|
||||
}.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
|
||||
|
||||
disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
|
||||
|
|
@ -68,7 +70,10 @@ let
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}";
|
||||
attrPath =
|
||||
let
|
||||
roundUpToEven = num: num + lib.mod num 2;
|
||||
in "${pname}_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}";
|
||||
packageName = pname;
|
||||
freeze = true;
|
||||
};
|
||||
|
|
@ -90,8 +95,13 @@ in rec {
|
|||
};
|
||||
|
||||
vala_0_54 = generic {
|
||||
version = "0.54.7";
|
||||
sha256 = "Ygecof8C5dF65yqppa3GGuav3P67DZ8GBjo2776soMc=";
|
||||
version = "0.54.8";
|
||||
sha256 = "7fs+eUhqS/SM666pKR5X/HfakyK2lh6VSd9tlz0EvIA=";
|
||||
};
|
||||
|
||||
vala_0_56 = generic {
|
||||
version = "0.56.0";
|
||||
sha256 = "2SvRPFYwkF7rapg9y3AiBNqXMUYMKm5OOfhnmW83EEA=";
|
||||
};
|
||||
|
||||
vala = vala_0_54;
|
||||
|
|
|
|||
|
|
@ -1,48 +1,66 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
, makeWrapper
|
||||
|
||||
, dbus
|
||||
, glib
|
||||
, dconf
|
||||
, libX11
|
||||
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
|
||||
, libXtst
|
||||
, libXi
|
||||
, libXext
|
||||
|
||||
, gnome # To pass updateScript
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "at-spi2-core";
|
||||
version = "2.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab";
|
||||
};
|
||||
version = "2.44.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ];
|
||||
# libXext is a transitive dependency of libXi
|
||||
buildInputs = [ libX11 libXtst libXi libXext ];
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "fu488oWwiQYP1rblGz6yys91LMo6CCx/TCxauEHlE1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
# at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
|
||||
libXtst
|
||||
libXi
|
||||
# libXext is a transitive dependency of libXi
|
||||
libXext
|
||||
];
|
||||
|
||||
# In atspi-2.pc dbus-1 glib-2.0
|
||||
propagatedBuildInputs = [ dbus glib ];
|
||||
propagatedBuildInputs = [
|
||||
dbus
|
||||
glib
|
||||
];
|
||||
|
||||
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
|
||||
# fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
|
||||
doCheck = false;
|
||||
|
||||
# Provide dbus-daemon fallback when it is not already running when
|
||||
# at-spi2-bus-launcher is executed. This allows us to avoid
|
||||
# including the entire dbus closure in libraries linked with
|
||||
# the at-spi2-core libraries.
|
||||
mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ];
|
||||
mesonFlags = [
|
||||
# Provide dbus-daemon fallback when it is not already running when
|
||||
# at-spi2-bus-launcher is executed. This allows us to avoid
|
||||
# including the entire dbus closure in libraries linked with
|
||||
# the at-spi2-core libraries.
|
||||
"-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folks";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "5xCZr8noj61OdXrhNLw/1j4SuQGtYrDtVTavt5Ekr18=";
|
||||
sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdk-pixbuf";
|
||||
version = "2.42.6";
|
||||
version = "2.42.8";
|
||||
|
||||
outputs = [ "out" "dev" "man" ]
|
||||
++ lib.optional withGtkDoc "devdoc"
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4";
|
||||
sha256 = "hKzqOsskEbKRNLMgFaWxqqYoRLGcSx74uJccawdZ9MY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -111,10 +111,6 @@ stdenv.mkDerivation rec {
|
|||
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
# We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
|
||||
$dev/bin/gdk-pixbuf-query-loaders --update-cache
|
||||
'' + lib.optionalString withGtkDoc ''
|
||||
# So that devhelp can find this.
|
||||
mkdir -p "$devdoc/share/devhelp"
|
||||
mv "$out/share/doc" "$devdoc/share/devhelp/books"
|
||||
'';
|
||||
|
||||
# The fixDarwinDylibNames hook doesn't patch binaries.
|
||||
|
|
@ -124,6 +120,11 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString withGtkDoc ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
|
||||
inherit doCheck;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, gtk3
|
||||
, atk
|
||||
, gobject-introspection
|
||||
, spidermonkey_78
|
||||
, spidermonkey_91
|
||||
, pango
|
||||
, cairo
|
||||
, readline
|
||||
|
|
@ -30,13 +30,13 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gjs";
|
||||
version = "1.70.1";
|
||||
version = "1.72.0";
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-u9wO7HzyX7xTR2n2ofssehjhe4ce/bDKWOmr8IsoAD8=";
|
||||
sha256 = "sha256-PvDK9xbjkg3WH3dI9tVuR2zA/Bg1GtBUjn3xoKub3K0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
|
|||
gobject-introspection
|
||||
cairo
|
||||
readline
|
||||
spidermonkey_78
|
||||
spidermonkey_91
|
||||
dbus # for dbus-run-session
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib-networking";
|
||||
version = "2.70.1";
|
||||
version = "2.72.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Kha/wtJxzNMmbj+0YryKQQPALoG7szmqktb7BgWS17w=";
|
||||
sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -45,16 +45,15 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib";
|
||||
version = "2.70.3";
|
||||
version = "2.72.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Iz+khBweGeOW23YH1Y9rdbozE8UL8Pzgey41MtXrfUY=";
|
||||
sha256 = "177w1MTnpi4I77jl8lKgE1cAe5WIqH/ytGOjhXAR950=";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [
|
||||
./darwin-compilation.patch
|
||||
./link-with-coreservices.patch
|
||||
] ++ optionals stdenv.hostPlatform.isMusl [
|
||||
./quark_init_on_demand.patch
|
||||
./gobject_init_on_demand.patch
|
||||
|
|
@ -116,7 +115,10 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
|
||||
(meson.override {
|
||||
withDarwinFrameworksGtkDocPatch = stdenv.isDarwin;
|
||||
})
|
||||
ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
|
||||
|
|
@ -142,8 +144,8 @@ stdenv.mkDerivation rec {
|
|||
chmod +x docs/reference/gio/concat-files-helper.py
|
||||
patchShebangs docs/reference/gio/concat-files-helper.py
|
||||
patchShebangs glib/gen-unicode-tables.pl
|
||||
patchShebangs tests/gen-casefold-txt.py
|
||||
patchShebangs tests/gen-casemap-txt.py
|
||||
patchShebangs glib/tests/gen-casefold-txt.py
|
||||
patchShebangs glib/tests/gen-casemap-txt.py
|
||||
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
|
||||
substituteInPlace gio/win32/meson.build \
|
||||
--replace "libintl, " ""
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/meson.build.orig 2020-11-25 13:47:38.499149252 +0900
|
||||
+++ b/meson.build 2020-11-25 13:48:47.098444800 +0900
|
||||
@@ -742,7 +742,7 @@
|
||||
|
||||
if glib_have_carbon
|
||||
glib_conf.set('HAVE_CARBON', true)
|
||||
- osx_ldflags += '-Wl,-framework,Carbon'
|
||||
+ osx_ldflags += ['-Wl,-framework,Carbon', '-Wl,-framework,CoreServices']
|
||||
glib_have_os_x_9_or_later = objcc.compiles('''#include <AvailabilityMacros.h>
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
|
||||
#error Compiling for minimum OS X version before 10.9
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue