MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #235371 from bobby285271/upd/cinnamon

Browse source 
Cinnamon 5.8
This commit is contained in:
Bobby Rong 2023-06-15 09:41:41 +08:00 committed by GitHub
commit 6a00501dfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 171 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -71,7 +71,7 @@ in
package = mkDefault pkgs.cinnamon.mint-themes;
};
iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
name = mkDefault "Mint-Y-Aqua";
name = mkDefault "Mint-Y-Sand";
package = mkDefault pkgs.cinnamon.mint-y-icons;
};
cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
@ -113,6 +113,8 @@ in
services.gnome.glib-networking.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gvfs.enable = true;
services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
services.touchegg.enable = mkDefault true;
services.udisks2.enable = true;
services.upower.enable = mkDefault config.powerManagement.enable;
services.xserver.libinput.enable = mkDefault true;
@ -178,6 +180,8 @@ in
nixos-artwork.wallpapers.simple-dark-gray
mint-artwork
mint-cursor-themes
mint-l-icons
mint-l-theme
mint-themes
mint-x-icons
mint-y-icons

4
pkgs/applications/editors/xed-editor/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "xed-editor";
version = "3.2.8";
version = "3.4.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xed";
rev = version;
sha256 = "sha256-ax769qjV0oZ6tnEE5FsXNbHETI6KNgvh0WviBsPs9j8=";
sha256 = "sha256-fBwxc6n4sNNRiKcax96Tl3cFD+Ryvmj+XizB3z2s4+Q=";
};
nativeBuildInputs = [

4
pkgs/applications/video/hypnotix/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "hypnotix";
version = "3.2";
version = "3.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "hypnotix";
rev = version;
hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q=";
hash = "sha256-Oxv70bFheKhlYyLdGcn0Hja+LAmn6RHfAh5FIjghD9o=";
};
patches = [

5
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -72,13 +72,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "5.6.8";
version = "5.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic=";
hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100=";
};
patches = [
@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt"
substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci"
substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"
popd
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}

1
pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
View file

@ -17,6 +17,7 @@ index 3c1e9a4f..a77d9b3c 100644
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-pkglibdir = join_paths(libdir, meson.project_name().to_lower())
+pkglibdir = libdir
girdir = join_paths(datadir, 'gir-1.0')
servicedir = join_paths(datadir, 'dbus-1', 'services')
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
po_dir = join_paths(meson.source_root(), 'po')

4
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
View file

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
version = "5.6.1";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ=";
hash = "sha256-tRLUdwEptLNngVq+qOPilGQipVXNeDlzohgu3VlVciI=";
};
buildInputs = [

4
pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-desktop";
version = "5.6.2";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-X4jf7+QFjoev1K6ywxN0n9MYUv7xI1/su+hHeesG02Y=";
hash = "sha256-rYTWtdYfMow3cIPhJdcmhyaIIU7fgVecWigbsCW0Piw=";
};
outputs = [ "out" "dev" ];

4
pkgs/desktops/cinnamon/cinnamon-menus/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-menus";
version = "5.6.0";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-6IOlXQhAy6YrSqybfGFUyn3Q2COvzwpj67y/k/YLNhU=";
hash = "sha256-AgA/DA7I9/0AJhlmgk0yAOJaZzpiQV1vM949Y6EOWVg=";
};
buildInputs = [

6
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View file

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "5.6.3";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk=";
hash = "sha256-Y1veBgWTCs7HRBuMwN+eHu4oygGYIanaQigMGVfkSuI=";
};
nativeBuildInputs = [
@ -89,8 +89,6 @@ stdenv.mkDerivation rec {
-e s,/usr/share/cinnamon-screensaver,$out/share,g \
-e s,/usr/share/iso-flag-png,${iso-flags-png-320x420}/share/iso-flags-png,g \
{} +
sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py
'';
preFixup = ''

4
pkgs/desktops/cinnamon/cinnamon-session/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "5.6.0";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-lyASp0jFwaPLPQ3Jnow6eTpUBybwhSEmQUK/20fsh7I=";
hash = "sha256-NVoP1KYh/z96NKMi9LjL4RgkjJg32oSy5WHJ91+70DI=";
};
patches = [

5
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
View file

@ -32,18 +32,17 @@
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "5.6.2";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-IqYfHMjKe7gVsM6HgihQMNkcXSYBOft1lamXOLa1Y8k=";
hash = "sha256-2ObfUdrCuvyhtpoxNzoH8tsFQLxNkMLQPFfJajXEsXU=";
};
patches = [
./csd-backlight-helper-fix.patch
./use-sane-install-dir.patch
];
buildInputs = [

27
pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch
View file

@ -1,27 +0,0 @@
From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 6 Feb 2021 13:55:03 +0100
Subject: [PATCH] use sane install-dir
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 0e11d50..54f4637 100644
--- a/meson.build
+++ b/meson.build
@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon')
subdir('plugins')
install_subdir(
- 'files',
- install_dir: '/',
+ 'files/usr',
+ install_dir: get_option('prefix'),
strip_directory: true,
)
--
2.30.0

4
pkgs/desktops/cinnamon/cinnamon-translations/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-translations";
version = "5.6.1";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-567xkQGLLhZtjAWXzW/MRiD14rrWeg0yvx97jtukRvc=";
hash = "sha256-QwLb8dxyub3W5KlYP1HinC07bTJ6f+/t07k3OWX9Qlg=";
};
nativeBuildInputs = [

8
pkgs/desktops/cinnamon/cjs/default.nix
View file

@ -6,7 +6,7 @@
, cairo
, glib
, readline
, spidermonkey_78
, spidermonkey_102
, meson
, dbus
, ninja
@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "cjs";
version = "5.6.1";
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
rev = version;
hash = "sha256-f9esbQi5WWSMAGlEs9HJFToOvmOrbP2lDW1gGh/48gw=";
hash = "sha256-DKCe8dKdYfdeWQ9Iqr0AmDU7YDN9QrQGdTkrBV/ywV0=";
};
outputs = [ "out" "dev" ];
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gobject-introspection
cairo
readline
spidermonkey_78
spidermonkey_102
dbus # for dbus-run-session
];

22
pkgs/desktops/cinnamon/folder-color-switcher/default.nix
View file

@ -2,27 +2,34 @@
, lib
, fetchFromGitHub
, gettext
, python3
}:
stdenvNoCC.mkDerivation rec {
pname = "folder-color-switcher";
version = "1.5.5";
version = "1.5.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
# They don't really do tags, this is just a named commit.
rev = "5e0b768b3a5bf88a828a2489b9428997b797c1ed";
sha256 = "sha256-DU75LM5v2/E/ZmqQgyiPsOOEUw9QQ/NXNtGDFzzYvyY=";
rev = "03311d62a62e2cd7d0592b241c287091161ec6b6";
sha256 = "sha256-HQv9vSpRSBjqbncGFv+O5XQtRJ+4Cq0aWZHoj5BhKYE=";
};
nativeBuildInputs = [
gettext
python3.pkgs.wrapPython
];
postPatch = ''
substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \
--replace "/usr/share" "$out/share"
--replace "/usr/share/locale" "$out/share" \
--replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \
--replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg"
substituteInPlace usr/share/caja-python/extensions/caja-folder-color-switcher.py \
--replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d"
'';
installPhase = ''
@ -34,6 +41,13 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
preFixup = ''
# For Gdk.cairo_surface_create_from_pixbuf()
# TypeError: Couldn't find foreign struct converter for 'cairo.Surface'
buildPythonPath ${python3.pkgs.pycairo}
patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py
'';
meta = with lib; {
homepage = "https://github.com/linuxmint/folder-color-switcher";
description = "Change folder colors for Nemo and Caja";

6
pkgs/desktops/cinnamon/mint-artwork/default.nix
View file

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "mint-artwork";
version = "1.7.3";
version = "1.7.5";
src = fetchurl {
urls = [
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20221206154838/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
"https://web.archive.org/web/20230601120342/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
];
hash = "sha256-lusYlmTL71VTGSJFssuIZVu7xJMuZQ7wj2rMtO1lhZ8=";
hash = "sha256-yd2FyGAznXGnHJLkMsSNqIx0sbKHl3cNMr7tpue7BlA=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/mint-themes/default.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.0.9";
version = "2.1.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-FvX4r7AZgSq52T9CKE9RagsKgQXExTYPptQBXadA3eI=";
hash = "sha256-Y+KmSKuREn2E3FySsScjL+oSpSFnyEqhoXQfU++86JY=";
};
nativeBuildInputs = [

4
pkgs/desktops/cinnamon/mint-x-icons/default.nix
View file

@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-x-icons";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM=";
hash = "sha256-Z07475Uiv4GKCOrKhDBXPZVBGpxdjN7vn2y0rRAZVm0=";
};
propagatedBuildInputs = [

4
pkgs/desktops/cinnamon/mint-y-icons/default.nix
View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-y-icons";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-XnQcVlN4xtZQDjijNV09m2m0ODYfFbrQaNd8ZQVToIw=";
hash = "sha256-yLsFEd4QyeEBA4IrYiy0sgNv0kG9WxjFsJQteoJc+YM=";
};
propagatedBuildInputs = [

4
pkgs/desktops/cinnamon/muffin/default.nix
View file

@ -35,7 +35,7 @@
stdenv.mkDerivation rec {
pname = "muffin";
version = "5.6.4";
version = "5.8.0";
outputs = [ "out" "dev" "man" ];
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-NnQ7KF979HnsEc4X/Wf1YOfUvByHvVIdTAcJyUjhsp8=";
hash = "sha256-2pF6mKSSW4S0mfb4iBfZKBIVXKzrVyPeftcVrWSWzhc=";
};
patches = [

12
pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
View file

@ -3,19 +3,15 @@
, fetchFromGitHub
}:
let
srcs = import ../srcs.nix { inherit fetchFromGitHub; };
in
python3.pkgs.buildPythonApplication rec {
pname = "nemo-emblems";
version = "5.6.0";
inherit (srcs) version src;
format = "setuptools";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I=";
};
sourceRoot = "${src.name}/nemo-emblems";
postPatch = ''

12
pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
View file

@ -10,16 +10,12 @@
, gnome
}:
let
srcs = import ../srcs.nix { inherit fetchFromGitHub; };
in
stdenv.mkDerivation rec {
pname = "nemo-fileroller";
version = "5.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = "nemo-fileroller-${version}";
sha256 = "sha256-dPmAHuJ0ZRTAwhnMMZEu1e9+qZRYCnlaaoCdUP45W+s=";
};
inherit (srcs) version src;
sourceRoot = "${src.name}/nemo-fileroller";

12
pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
View file

@ -11,16 +11,12 @@
, substituteAll
}:
let
srcs = import ../srcs.nix { inherit fetchFromGitHub; };
in
stdenv.mkDerivation rec {
pname = "nemo-python";
version = "5.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I=";
};
inherit (srcs) version src;
sourceRoot = "${src.name}/nemo-python";

15
pkgs/desktops/cinnamon/nemo-extensions/srcs.nix Normal file
View file

@ -0,0 +1,15 @@
{ fetchFromGitHub }:
rec {
# When you bump this, you should make sure all nemo-extensions
# are actually using this file since we try to deal with tags
# like nemo-fileroller-5.6.1 according to upstream's wishes.
version = "5.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
};
}

4
pkgs/desktops/cinnamon/nemo/default.nix
View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "5.6.5";
version = "5.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-HdDe2VE9LQqiwFrUSIctOi/ffNOmLy6SyG30EL8UA5Q=";
sha256 = "sha256-Be67TOA1gLwSYx8y2iyfvY0QCpWOFutpXMDaPiTRQGg=";
};
patches = [

105
pkgs/desktops/cinnamon/pix/default.nix
View file

@ -1,70 +1,99 @@
{ stdenv
, lib
, fetchurl
, fetchFromGitHub
, autoreconfHook
, cinnamon-desktop
, file
, gdk-pixbuf
, glib
, gobject-introspection
, gtk-doc
, gtk3
, intltool
, itstool
, libtool
, libxml2
, pkg-config
, shared-mime-info
, wrapGAppsHook
, xapp
, yelp-tools
, meson
, ninja
, exiv2
, libheif
, libjpeg
, libtiff
, gst_all_1
, libraw
, libsoup
, libsecret
, webkitgtk
, libwebp
, glib
, gtk3
, gsettings-desktop-schemas
, librsvg
, libwebp
, json-glib
, gnome
, clutter
, webkitgtk
, lcms2
, bison
, flex
, clutter-gtk
, wrapGAppsHook
, shared-mime-info
, python3
, desktop-file-utils
, itstool
, xapp
}:
stdenv.mkDerivation rec {
pname = "pix";
version = "2.8.9";
version = "3.0.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-7g0j1cWgNtWlqKWzBnngUA2WNr8Zh8YO/jJ8OdTII7Y=";
sha256 = "sha256-sKmdJOuT4Ioy5DmWN9ly+9bqSn4frcVPD5qMTKtxtiQ=";
};
nativeBuildInputs = [
wrapGAppsHook
autoreconfHook
cinnamon-desktop
gdk-pixbuf
gnome.gnome-common
gobject-introspection
gtk-doc
intltool
bison
desktop-file-utils
flex
itstool
libtool
meson
ninja
pkg-config
yelp-tools
python3
wrapGAppsHook
];
buildInputs = [
clutter-gtk
exiv2
glib
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-libav
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gtk3
xapp
libsecret
webkitgtk
libwebp
librsvg
json-glib
clutter
lcms2
libheif
libjpeg
libraw
librsvg
libsecret
libsoup
libtiff
libwebp
webkitgtk
xapp
];
postPatch = ''
chmod +x pix/make-pix-h.py
patchShebangs data/gschemas/make-enums.py \
pix/make-pix-h.py \
po/make-potfiles-in.py \
postinstall.py \
pix/make-authors-tab.py
'';
preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
meta = with lib; {
description = "A generic image viewer from Linux Mint";
homepage = "https://github.com/linuxmint/pix";

14
pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -22,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "xapp";
version = "2.4.3";
version = "2.6.1";
outputs = [ "out" "dev" ];
@ -30,9 +30,13 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg=";
hash = "sha256-ZxIPiDLcMHEmlnrImctI2ZfH3AIOjB4m/RPGipJ7koM=";
};
# Recommended by upstream, which enables the build of xapp-debug.
# https://github.com/linuxmint/xapp/issues/169#issuecomment-1574962071
mesonBuildType = "debugoptimized";
nativeBuildInputs = [
meson
ninja
@ -70,11 +74,7 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs \
libxapp/g-codegen.py \
meson-scripts/g-codegen.py \
schemas/meson_install_schemas.py
patchShebangs schemas/meson_install_schemas.py
# Patch pastebin & inxi location
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info

8
pkgs/desktops/cinnamon/xreader/default.nix
View file

@ -16,7 +16,7 @@
, poppler
, libspectre
, libgxps
, webkitgtk
, webkitgtk_4_1
, nodePackages
, ninja
, gsettings-desktop-schemas
@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "xreader";
version = "3.6.3";
version = "3.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-KuCcOnhM8AzKC8hfBpdcnC/ubDVsElKMZuxEnTcJLn0=";
sha256 = "sha256-ZmaY9FlDIJNQ9jYkUJDnKAgwn5wlQY89eWx3/RJZA7E=";
};
nativeBuildInputs = [
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
poppler
libspectre
libgxps
webkitgtk
webkitgtk_4_1
nodePackages.mathjax
djvulibre
];

4
pkgs/desktops/cinnamon/xviewer/default.nix
View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "xviewer";
version = "3.2.12";
version = "3.4.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU=";
sha256 = "sha256-HVxCBqaKtsEGhGAB+dBCOnjAjLZHv0XqTifPrvoYdj8=";
};
nativeBuildInputs = [

11
pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
View file

@ -4,7 +4,6 @@
, meson
, ninja
, pkg-config
, python3
, wrapGAppsHook
, cinnamon
, glib
@ -16,20 +15,19 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-xapp";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xdg-desktop-portal-xapp";
rev = version;
hash = "sha256-oXV4u/w4MWhKHf5vNbUNcyEJpKVFWcyEs1HEqo6eCyU=";
hash = "sha256-N0LVgk3VT0Fax1GTB7jzFhwzNEeAuyFHAuxXNCo2o3Y=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
wrapGAppsHook
];
@ -46,11 +44,6 @@ stdenv.mkDerivation rec {
"-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
];
postPatch = ''
chmod +x data/meson_install_schemas.py
patchShebangs data/meson_install_schemas.py
'';
meta = with lib; {
description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce";
homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp";