summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-10-01 04:39:42 +0000
committerJan Tojnar <jtojnar@gmail.com>2021-10-09 21:35:53 +0200
commit2401535732471b3cc72d9e28de4fdda4f1c8a03b (patch)
tree926b9794304706d3da36f65c0d590ec88f80088a
parente985b2bc238d6b92c97050a4a6b2bfb2b465c947 (diff)
downloadnixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.tar
nixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.tar.gz
nixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.tar.bz2
nixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.tar.lz
nixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.tar.xz
nixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.tar.zst
nixpkgs-2401535732471b3cc72d9e28de4fdda4f1c8a03b.zip
gnome.gnome-autoar: 0.3.3 → 0.4.0
-rw-r--r--pkgs/desktops/gnome/misc/gnome-autoar/default.nix38
1 files changed, 32 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
index 2afb401bef4..e8bfaffb45e 100644
--- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
@@ -1,5 +1,9 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
+, fetchpatch
+, meson
+, ninja
 , pkg-config
 , gnome
 , gtk3
@@ -11,21 +15,32 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-autoar";
-  version = "0.3.3";
+  version = "0.4.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ=";
+    sha256 = "6oxtUkurxxKsWeHQ46yL8BN0gtrfM8lP6RE3lKG8RHQ=";
   };
 
-  passthru = {
-    updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; };
-  };
+  patches = [
+    # Make compatible with older Meson.
+    # https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/26
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/2d90da6174c03aad546802234a3d77fa0b714e6b.patch";
+      sha256 = "CysDpBJmVPm4gOSV2h041MY2yApfAy8+4QC7Jlka1xE=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/ac21bd0c50584a1905a0da65d4bf9a6926ecd483.patch";
+      sha256 = "aTu6eKFSKjljk0TYkhFjPcD8eJCIk8TR0YhZYO9JE1k=";
+    })
+  ];
 
   nativeBuildInputs = [
     gobject-introspection
+    meson
+    ninja
     pkg-config
     vala
   ];
@@ -39,6 +54,17 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  mesonFlags = [
+    "-Dvapi=true"
+  ];
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "gnome-autoar";
+      attrPath = "gnome.gnome-autoar";
+    };
+  };
+
   meta = with lib; {
     platforms = platforms.linux;
     maintainers = teams.gnome.members;