diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-05-04 13:14:34 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-05-06 10:53:04 +0200 |
| commit | f9eaa902c0aedf01d476aa7eb2c040c9f9b99387 (patch) | |
| tree | 6414b395acf8f92a81be341140ac6755c12c2c95 | |
| parent | 4c4d0d6bc3bd09b33cce0d547892e32fc9649a0c (diff) | |
| download | nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.tar nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.tar.gz nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.tar.bz2 nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.tar.lz nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.tar.xz nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.tar.zst nixpkgs-f9eaa902c0aedf01d476aa7eb2c040c9f9b99387.zip | |
atk: 2.36.0 → 2.38.0
https://gitlab.gnome.org/GNOME/atk/-/compare/ATK_2_36_0...2.38.0 Also clean up the expression to match the rest of the GNOME package set.
| -rw-r--r-- | pkgs/development/libraries/atk/default.nix | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 08e6e5b0e41..ce3352b5751 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome +{ stdenv +, lib +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, glib +, fixDarwinDylibNames +, gobject-introspection +, gnome }: -let +stdenv.mkDerivation rec { pname = "atk"; - version = "2.36.0"; -in + version = "2.38.0"; -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY="; }; - outputs = [ "out" "dev" ]; + patches = [ + # meson builds an incorrect .pc file + # glib should be Requires not Requires.private + ./fix_pc.patch + ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + glib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; propagatedBuildInputs = [ # Required by atk.pc glib ]; - patches = [ - # meson builds an incorrect .pc file - # glib should be Requires not Requires.private - ./fix_pc.patch - ]; - mesonFlags = [ "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; @@ -55,7 +68,7 @@ stdenv.mkDerivation rec { control running applications. ''; - homepage = "http://library.gnome.org/devel/atk/"; + homepage = "https://gitlab.gnome.org/GNOME/atk"; license = lib.licenses.lgpl2Plus; |