From ce3b463c7900a354775a35f8b75dbd2cd1ca2e7d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Jun 2021 23:44:58 +0200 Subject: games: /s/name/pname&version/ --- pkgs/desktops/gnome/games/atomix/default.nix | 6 ++---- pkgs/desktops/gnome/games/gnome-klotski/default.nix | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 43d9aaa7680..e57191f0a1d 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 , gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: -let +stdenv.mkDerivation rec { pname = "atomix"; version = "3.34.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/atomix/${lib.versions.majorMinor version}/atomix-${version}.tar.xz"; sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index bb4cdae8fa3..e21cceb0850 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -3,14 +3,12 @@ , meson, ninja, python3 }: -let +stdenv.mkDerivation rec { pname = "gnome-klotski"; version = "3.38.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-klotski/${lib.versions.majorMinor version}/gnome-klotski-${version}.tar.xz"; sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; }; -- cgit 1.4.1