diff options
Diffstat (limited to 'pkgs/desktops/gnome/games/atomix/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome/games/atomix/default.nix | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 43278a05b4d..0d43c8e2ee7 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,33 +1,43 @@ -{ lib, stdenv, fetchurl, fetchpatch -, meson, ninja, pkg-config, wrapGAppsHook, python3 -, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook +, python3 +, gettext +, gnome +, glib +, gtk3 +, libgnome-games-support +, gdk-pixbuf +}: + +stdenv.mkDerivation (finalAttrs: { pname = "atomix"; - version = "3.34.0"; + version = "44.0"; 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 = "yISTF2iNh9pzTJBjA1YxBSAH8qh5m2xsyRUmWIC1X7Q="; }; - 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; }; -} +}) |