summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-02-27 10:55:42 +0800
committerBobby Rong <rjl931189261@126.com>2022-02-27 11:34:38 +0800
commit4ec18cd57e29e4e426875cb7e86591a0083faad7 (patch)
tree982d5d076eee388ee93472550811bd85e40760cb
parentf1143cb501dad871fbd79d12c772c1bd3b5fd385 (diff)
downloadnixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.tar
nixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.tar.gz
nixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.tar.bz2
nixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.tar.lz
nixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.tar.xz
nixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.tar.zst
nixpkgs-4ec18cd57e29e4e426875cb7e86591a0083faad7.zip
bamf: 0.5.5 -> 0.5.6
-rw-r--r--pkgs/development/libraries/bamf/default.nix32
1 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 406ff81fe8e..96b677b27b5 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,8 +1,7 @@
-{ lib, stdenv
-, pantheon
-, autoconf
-, automake
-, libtool
+{ stdenv
+, lib
+, autoreconfHook
+, gitUpdater
 , gnome
 , which
 , fetchgit
@@ -23,26 +22,24 @@
 
 stdenv.mkDerivation rec {
   pname = "bamf";
-  version = "0.5.5";
+  version = "0.5.6";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchgit {
     url = "https://git.launchpad.net/~unity-team/bamf";
-    rev = "${version}+21.10.20210710-0ubuntu1";
-    sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0";
+    rev = version;
+    sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ=";
   };
 
   nativeBuildInputs = [
     (python3.withPackages (ps: with ps; [ lxml ])) # Tests
-    autoconf
-    automake
+    autoreconfHook
     dbus
     docbook_xsl
     gnome.gnome-common
     gobject-introspection
     gtk-doc
-    libtool
     pkg-config
     vala
     which
@@ -69,22 +66,23 @@ stdenv.mkDerivation rec {
     "--enable-headless-tests"
   ];
 
-  # fix paths
+  # Fix paths
   makeFlags = [
     "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/"
     "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
   ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
   # TODO: Requires /etc/machine-id
   doCheck = false;
 
-  # glib-2.62 deprecations
+  # Ignore deprecation errors
   NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
 
+  passthru.updateScript = gitUpdater {
+    inherit pname version;
+    ignoredVersions = ".ubuntu.*";
+  };
+
   meta = with lib; {
     description = "Application matching framework";
     longDescription = ''