libunity: unstable-2019-03-19 → unstable-2021-02-01
Fix build with latest Vala.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, pkg-config
|
||||
, glib
|
||||
@@ -14,16 +15,24 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libunity";
|
||||
version = "unstable-2019-03-19";
|
||||
version = "unstable-2021-02-01";
|
||||
|
||||
outputs = [ "out" "dev" "py" ];
|
||||
|
||||
# Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/
|
||||
src = fetchgit {
|
||||
url = "https://git.launchpad.net/ubuntu/+source/libunity";
|
||||
rev = "import/7.1.4+19.04.20190319-0ubuntu1";
|
||||
sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
|
||||
rev = "import/7.1.4+19.04.20190319-5";
|
||||
sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix builf with latest Vala
|
||||
# https://code.launchpad.net/~jtojnar/libunity/libunity
|
||||
# Did not send upstream because Ubuntu is stuck on Vala 0.48.
|
||||
./fix-vala.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gobject-introspection
|
||||
@@ -43,11 +52,6 @@ stdenv.mkDerivation {
|
||||
libdbusmenu
|
||||
];
|
||||
|
||||
patches = [
|
||||
# See: https://gitlab.gnome.org/GNOME/vala/issues/766
|
||||
./fix-vala.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
intltoolize
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user