git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #58050 from worldofpeace/libunity/fix-build

libunity fix build

commitac1bd5b1d43670b8a3bc1ae813ac7fc55e779c5d authorworldofpeace <worldofpeace@users.noreply.github.com> dateSun 24 Mar 2019, 15:12 (8 years ago) parentaeea929dafe2bd
3 files changed+71−34
pkgs/development/libraries/dee/default.nix+42−12 pkgs/development/libraries/libunity/default.nix+28−19 pkgs/top-level/all-packages.nix+1−3
pkgs/development/libraries/dee/default.nix+42−12
@@ -1,27 +1,57 @@
1−{ stdenv, fetchurl, python, pkgconfig
2−, glib, icu, gobject-introspection }:
1+{ stdenv
2+, fetchgit
3+, pkgconfig
4+, glib
5+, icu
6+, gobject-introspection
7+, dbus-glib
8+, vala
9+, python3
10+, autoreconfHook
11+}:
312
413stdenv.mkDerivation rec {
5− name = "dee-${version}";
6− version = "1.2.7";
14+ pname = "dee";
15+ version = "unstable-2017-06-16";
716
8− src = fetchurl {
9− url = "https://launchpad.net/dee/1.0/${version}/+download/${name}.tar.gz";
10− sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v";
17+ outputs = [ "out" "dev" "py" ];
18+
19+ src = fetchgit {
20+ url = "https://git.launchpad.net/ubuntu/+source/dee";
21+ rev = "import/1.2.7+17.10.20170616-4ubuntu1";
22+ sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394";
1123 };
1224
13− buildInputs = [ glib gobject-introspection icu ];
14− nativeBuildInputs = [ python pkgconfig ];
25+ patches = [
26+ "${src}/debian/patches/gtkdocize.patch"
27+ "${src}/debian/patches/strict-prototype.patch"
28+ "${src}/debian/patches/icu-pkg-config.patch"
29+ ];
30+
31+ nativeBuildInputs = [
32+ pkgconfig
33+ vala
34+ autoreconfHook
35+ gobject-introspection
36+ python3
37+ ];
1538
16− NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6
39+ buildInputs = [
40+ glib
41+ icu
42+ dbus-glib
43+ ];
1744
18− enableParallelBuilding = true;
45+ configureFlags = [
46+ "--disable-gtk-doc"
47+ "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
48+ ];
1949
2050 meta = with stdenv.lib; {
2151 description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus";
2252 homepage = https://launchpad.net/dee;
2353 license = licenses.lgpl3;
2454 platforms = platforms.linux;
25− maintainers = with maintainers; [ abbradar ];
55+ maintainers = with maintainers; [ abbradar worldofpeace ];
2656 };
2757}
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
@@ -10855,9 +10855,7 @@ in
1085510855
1085610856 libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
1085710857
10858− libunity = callPackage ../development/libraries/libunity {
10859− inherit (gnome3) gnome-common;
10860− };
10858+ libunity = callPackage ../development/libraries/libunity { };
1086110859
1086210860 libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
1086310861 libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };