Merge pull request #238782 from bobby285271/upd/gnome
GNOME updates 2023-06-20
This commit is contained in:
commit
f55321995c
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
@ -22,22 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sound-juicer";
|
||||
version = "3.38.0";
|
||||
version = "3.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf";
|
||||
sha256 = "LuiCdEORvrTG1koPaCX7dlUQtwbsK3BL+0LkKvquHeY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# data/meson.build:2:5: ERROR: Function does not take positional arguments.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/sound-juicer/-/commit/9f97ca1faca396099f52264a9729aa355f8d122e.patch";
|
||||
sha256 = "8JllVSQgI7KiBI5WP6QtXRiggYuD89NSJJp1hP4Dbao=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evince";
|
||||
version = "44.1";
|
||||
version = "44.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Fa/TuxX/s4/sqzTCM1CVCtJwqwOoW5TjM9ndfuanQxQ=";
|
||||
sha256 = "mnXH/49ZkhjQcOCftAgssm+bhjcKm/rpjhqstWTWdd0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,19 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-video-effects";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd";
|
||||
sha256 = "166utGs/WoMvsuDZC0K/jGFgICylKsmt0Xr84ZLjyKg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix effectsdir in .pc file
|
||||
# https://gitlab.gnome.org/GNOME/gnome-video-effects/commit/955404195ada606819974dd63c48956f25611e14
|
||||
./fix-pc-file.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -17,7 +17,7 @@
|
||||
# Can't use pkgconfig helper https://github.com/mesonbuild/meson/issues/2253
|
||||
conf = configuration_data()
|
||||
conf.set('prefix', prefix)
|
||||
-conf.set('datarootdir', pkgdatadir)
|
||||
+conf.set('datarootdir', datadir)
|
||||
conf.set('VERSION', meson.project_version())
|
||||
|
||||
pkg = configure_file(configuration: conf,
|
|
@ -12,24 +12,27 @@
|
|||
, glib
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gtksourceview4
|
||||
, libadwaita
|
||||
, libhandy
|
||||
, webkitgtk
|
||||
, webkitgtk_4_1
|
||||
, webkitgtk_6_0
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cambalache";
|
||||
version = "0.10.3";
|
||||
version = "0.12.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
# Did not fetch submodule since it is only for tests we don't run.
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "jpu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Xm8h3BBRibdLCeI/OeprF5dCCiNrfJCg7aE24uleCds=";
|
||||
sha256 = "sha256-kGCpccWIhaeWrzLlrDI7Vzd0KuAIKxvLrDuSqWtpSLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -51,7 +54,9 @@ python3.pkgs.buildPythonApplication rec {
|
|||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
webkitgtk
|
||||
gtksourceview4
|
||||
webkitgtk_4_1
|
||||
webkitgtk_6_0
|
||||
# For extra widgets support.
|
||||
libadwaita
|
||||
libhandy
|
||||
|
@ -63,7 +68,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
postPatch = ''
|
||||
patchShebangs postinstall.py
|
||||
# those programs are used at runtime not build time
|
||||
# https://gitlab.gnome.org/jpu/cambalache/-/blob/main/meson.build#L79-80
|
||||
# https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80
|
||||
substituteInPlace ./meson.build \
|
||||
--replace "find_program('broadwayd', required: true)" "" \
|
||||
--replace "find_program('gtk4-broadwayd', required: true)" ""
|
||||
|
|
Loading…
Reference in a new issue