JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dee: pull in patches

Browse Source 
Fixes the deprecation warnings and vapi stuff.
This also allows us to use latest vala.
This commit is contained in:
worldofpeace 2019-09-19 00:43:34 -04:00 committed by Jan Tojnar
parent 9e6896cb59
commit 41d71bacd6
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/dee/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv { stdenv
, fetchgit , fetchgit
, fetchpatch
, pkgconfig , pkgconfig
, glib , glib
, icu , icu
, gobject-introspection , gobject-introspection
, dbus-glib , dbus-glib
, vala_0_40 , vala
, python3 , python3
, autoreconfHook , autoreconfHook
}: }:
@ -18,20 +19,26 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/dee"; url = "https://git.launchpad.net/ubuntu/+source/dee";
rev = "import/1.2.7+17.10.20170616-4ubuntu1"; rev = "import/1.2.7+17.10.20170616-4ubuntu3";
sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394"; sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk";
}; };
patches = [ patches = [
"${src}/debian/patches/gtkdocize.patch" "${src}/debian/patches/gtkdocize.patch"
"${src}/debian/patches/strict-prototype.patch" "${src}/debian/patches/strict-prototype.patch"
"${src}/debian/patches/icu-pkg-config.patch" "${src}/debian/patches/vapi-skip-properties.patch"
# Fixes glib 2.62 deprecations
(fetchpatch {
name = "dee-1.2.7-deprecated-g_type_class_add_private.patch";
url = "https://src.fedoraproject.org/rpms/dee/raw/1a9a4ce3377074fabfca653ffe0287cd73aef82f/f/dee-1.2.7-deprecated-g_type_class_add_private.patch";
sha256 = "13nyprq7bb7lnzkcb7frcpzidbl836ycn5bvmwa2k0nhmj6ycbx5";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
# https://gitlab.gnome.org/GNOME/vala/issues/803 vala
vala_0_40
autoreconfHook autoreconfHook
gobject-introspection gobject-introspection
python3 python3
@ -43,9 +50,6 @@ stdenv.mkDerivation rec {
dbus-glib dbus-glib
]; ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
configureFlags = [ configureFlags = [
"--disable-gtk-doc" "--disable-gtk-doc"
"--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"