libunity: 2015-10-02 -> 2019-03-19

Fixes build with newer vala.

Chose to fetch from ubuntu's git packaging because it
is easier for me to maintain. This would be the same
version used in Ubuntu's Disco Dongo.

Changelog: https://git.launchpad.net/ubuntu/+source/libunity/tree/debian/changelog?id=adae0cbb67ee5eb0913e8cd1887e15e72800251f

pkgs/development/libraries/libunity/default.nix

@@ -1,27 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
+{ stdenv
-, glib, vala, dee, gobject-introspection, libdbusmenu
+, fetchgit
-, gtk3, intltool, gnome-common, python3, icu }:
+, pkgconfig
+, glib
+, vala
+, dee
+, gobject-introspection
+, libdbusmenu
+, gtk3
+, intltool
+, python3
+, autoreconfHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "libunity";
-  version = "7.1.4";
+  version = "unstable-2019-03-19";
 
-  name = "${pname}-${version}";
+  outputs = [ "out" "dev" "py" ];
 
-  outputs = [ "out" "dev" ];
+  src = fetchgit {
-
+    url = "https://git.launchpad.net/ubuntu/+source/libunity";
-  src = fetchurl {
+    rev = "import/7.1.4+19.04.20190319-0ubuntu1";
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz";
+    sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
-    sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij";
   };
 
   nativeBuildInputs = [
-    autoconf
+    autoreconfHook
-    automake
-    gnome-common
     gobject-introspection
     intltool
-    libtool
     pkgconfig
     python3
     vala
@@ -32,17 +38,20 @@ stdenv.mkDerivation rec {
     gtk3
   ];
 
-  propagatedBuildInputs = [ dee libdbusmenu ];
+  propagatedBuildInputs = [
+    dee
+    libdbusmenu
+  ];
 
-  preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+  preConfigure = ''
+    intltoolize
+  '';
 
   configureFlags = [
     "--disable-static"
-    "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides"
+    "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
   ];
 
-  NIX_LDFLAGS = "-L${icu}/lib";
-
   meta = with stdenv.lib; {
     description = "A library for instrumenting and integrating with all aspects of the Unity shell";
     homepage = https://launchpad.net/libunity;

pkgs/top-level/all-packages.nix

@@ -10820,9 +10820,7 @@ in
 
   libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
 
-  libunity = callPackage ../development/libraries/libunity {
+  libunity = callPackage ../development/libraries/libunity { };
-    inherit (gnome3) gnome-common;
-  };
 
   libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
   libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };