diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-19 00:43:34 -0400 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:11 +0200 |
| commit | 41d71bacd6f224a540ee7d58b3caa6f43b895ad5 (patch) | |
| tree | 0c480486ce207734413da32357eff5341e5c1fbd /pkgs | |
| parent | 9e6896cb59a0f948b3d8ddf7dd7b302ed5b728b0 (diff) | |
| download | nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.tar nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.tar.gz nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.tar.bz2 nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.tar.lz nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.tar.xz nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.tar.zst nixpkgs-41d71bacd6f224a540ee7d58b3caa6f43b895ad5.zip | |
dee: pull in patches
Fixes the deprecation warnings and vapi stuff. This also allows us to use latest vala.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/dee/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 1318d9453b3..dd26e5eb8ba 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,11 +1,12 @@ { stdenv , fetchgit +, fetchpatch , pkgconfig , glib , icu , gobject-introspection , dbus-glib -, vala_0_40 +, vala , python3 , autoreconfHook }: @@ -18,20 +19,26 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dee"; - rev = "import/1.2.7+17.10.20170616-4ubuntu1"; - sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394"; + rev = "import/1.2.7+17.10.20170616-4ubuntu3"; + sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk"; }; patches = [ "${src}/debian/patches/gtkdocize.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 = [ pkgconfig - # https://gitlab.gnome.org/GNOME/vala/issues/803 - vala_0_40 + vala autoreconfHook gobject-introspection python3 @@ -43,9 +50,6 @@ stdenv.mkDerivation rec { dbus-glib ]; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; - configureFlags = [ "--disable-gtk-doc" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" |