gnome.atomix: 3.34.0 → 44.rc

https://gitlab.gnome.org/GNOME/atomix/-/compare/3.34.0...44.rc

Also clean up the expression.

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Jan Tojnar 2023-03-06 16:39:04 +01:00
parent 4af2ecdddc
commit b42fecbae8

View File

@ -1,33 +1,43 @@
{ lib, stdenv, fetchurl, fetchpatch
, meson, ninja, pkg-config, wrapGAppsHook, python3
, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
{ lib
, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, wrapGAppsHook
, python3
, gettext
, gnome
, glib
, gtk3
, libgnome-games-support
, gdk-pixbuf
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "atomix";
version = "3.34.0";
version = "44.rc";
src = fetchurl {
url = "mirror://gnome/sources/atomix/${lib.versions.majorMinor version}/atomix-${version}.tar.xz";
sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00";
url = "mirror://gnome/sources/atomix/${lib.versions.major finalAttrs.version}/atomix-${finalAttrs.version}.tar.xz";
sha256 = "pujNEnUJNLv+6Grwd/uxnTcuq+GxXeemxecOjLdDJAw=";
};
patches = [
# Pull upstream fix for -fno-common toolchains like gcc-10:
# https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/2
(fetchpatch {
name = "fno-common.patch";
url = "https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b.patch";
sha256 = "0nrwl6kb1als9mxd5s0la45z63xwshqlnxqjaax32w8yrl6kz7l8";
})
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
wrapGAppsHook
python3
];
nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ];
buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ];
# When building with clang ceil() is not inlined:
# ld: src/libatomix.a.p/canvas_helper.c.o: undefined reference to symbol 'ceil@@GLIBC_2.2.5'
# https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/3
NIX_LDFLAGS = "-lm";
buildInputs = [
glib
gtk3
gdk-pixbuf
libgnome-games-support
];
postPatch = ''
chmod +x meson_post_install.py
@ -36,8 +46,8 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "atomix";
attrPath = "gnome.atomix";
};
};
@ -48,4 +58,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
}
})