git.iko.soy/typeable/nixpkgs
on master help sign in
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

commitdea05e36a119e9325f55e0766589b7b9e48a9b58 authorworldofpeace <worldofpeace@users.noreply.github.com> dateThu 21 Mar 2019, 09:26 (8 years ago) parent427d13b
2 files changed+29−22
pkgs/development/libraries/libunity/default.nix+28−19 pkgs/top-level/all-packages.nix+1−3
pkgs/development/libraries/libunity/default.nix+28−19
@@ -1,27 +1,33 @@
1−{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
2−, glib, vala, dee, gobject-introspection, libdbusmenu
3−, gtk3, intltool, gnome-common, python3, icu }:
1+{ stdenv
2+, fetchgit
3+, pkgconfig
4+, glib
5+, vala
6+, dee
7+, gobject-introspection
8+, libdbusmenu
9+, gtk3
10+, intltool
11+, python3
12+, autoreconfHook
13+}:
414
515stdenv.mkDerivation rec {
616 pname = "libunity";
7− version = "7.1.4";
17+ version = "unstable-2019-03-19";
818
9− name = "${pname}-${version}";
19+ outputs = [ "out" "dev" "py" ];
1020
11− outputs = [ "out" "dev" ];
12−
13− src = fetchurl {
14− url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz";
15− sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij";
21+ src = fetchgit {
22+ url = "https://git.launchpad.net/ubuntu/+source/libunity";
23+ rev = "import/7.1.4+19.04.20190319-0ubuntu1";
24+ sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
1625 };
1726
1827 nativeBuildInputs = [
19− autoconf
20− automake
21− gnome-common
28+ autoreconfHook
2229 gobject-introspection
2330 intltool
24− libtool
2531 pkgconfig
2632 python3
2733 vala
@@ -32,17 +38,20 @@ stdenv.mkDerivation rec {
3238 gtk3
3339 ];
3440
35− propagatedBuildInputs = [ dee libdbusmenu ];
41+ propagatedBuildInputs = [
42+ dee
43+ libdbusmenu
44+ ];
3645
37− preConfigure = "NOCONFIGURE=1 ./autogen.sh";
46+ preConfigure = ''
47+ intltoolize
48+ '';
3849
3950 configureFlags = [
4051 "--disable-static"
41− "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides"
52+ "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
4253 ];
4354
44− NIX_LDFLAGS = "-L${icu}/lib";
45−
4655 meta = with stdenv.lib; {
4756 description = "A library for instrumenting and integrating with all aspects of the Unity shell";
4857 homepage = https://launchpad.net/libunity;
pkgs/top-level/all-packages.nix+1−3
@@ -10820,9 +10820,7 @@ in
1082010820
1082110821 libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
1082210822
10823− libunity = callPackage ../development/libraries/libunity {
10824− inherit (gnome3) gnome-common;
10825− };
10823+ libunity = callPackage ../development/libraries/libunity { };
1082610824
1082710825 libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
1082810826 libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };