diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-21 09:26:50 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-21 10:41:00 -0400 |
commit | dea05e36a119e9325f55e0766589b7b9e48a9b58 (patch) | |
tree | f8842930fcf204590d7e52a0c876afeece4f0e7b /pkgs/development/libraries/libunity | |
parent | 427d13b66ab97751a412f2ae9a87a8f5ebd47016 (diff) | |
download | nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.tar nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.tar.gz nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.tar.bz2 nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.tar.lz nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.tar.xz nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.tar.zst nixlib-dea05e36a119e9325f55e0766589b7b9e48a9b58.zip |
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
Diffstat (limited to 'pkgs/development/libraries/libunity')
-rw-r--r-- | pkgs/development/libraries/libunity/default.nix | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 52f01229c4af..a0ec3b74cc17 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool -, glib, vala, dee, gobject-introspection, libdbusmenu -, gtk3, intltool, gnome-common, python3, icu }: +{ stdenv +, fetchgit +, 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 = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz"; - sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij"; + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/libunity"; + rev = "import/7.1.4+19.04.20190319-0ubuntu1"; + sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; }; nativeBuildInputs = [ - autoconf - automake - gnome-common + autoreconfHook 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; |