diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-21 17:27:36 -0400 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:13 +0200 |
commit | 752ebe1078db6f067febbd5a89873418b9b8ac41 (patch) | |
tree | b7b7118ef68b4173df989e0431030921cf4ddec9 | |
parent | e7b7d75825471cbf7fe3194235d75dc8897ef37c (diff) | |
download | nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.tar nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.tar.gz nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.tar.bz2 nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.tar.lz nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.tar.xz nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.tar.zst nixpkgs-752ebe1078db6f067febbd5a89873418b9b8ac41.zip |
libunity: fix build with latest vala
See: https://gitlab.gnome.org/GNOME/vala/issues/766
-rw-r--r-- | pkgs/development/libraries/libunity/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libunity/fix-vala.patch | 36 |
2 files changed, 41 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 2baaa14b88e..daaf3de6bcc 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation { libdbusmenu ]; + patches = [ + # See: https://gitlab.gnome.org/GNOME/vala/issues/766 + ./fix-vala.patch + ]; + preConfigure = '' intltoolize ''; diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch new file mode 100644 index 00000000000..ec34229b444 --- /dev/null +++ b/pkgs/development/libraries/libunity/fix-vala.patch @@ -0,0 +1,36 @@ +diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala +--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 ++++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 +@@ -51,7 +51,7 @@ + */ + public abstract int category_index_for_scope_id (string scope_id); + +- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) ++ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) + { + Object (dbus_path: dbus_path_, id: id_, is_master: true, + merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); +diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala +--- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500 ++++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400 +@@ -61,7 +61,7 @@ + internal CategorySet _categories; + internal FilterSet _filters; + +- public DeprecatedScopeBase (string dbus_path_, string id_) ++ protected DeprecatedScopeBase (string dbus_path_, string id_) + { + Object (dbus_path: dbus_path_, id: id_); + } +diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala +--- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500 ++++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 +@@ -63,7 +63,7 @@ + */ + public abstract class GridRenderer: PreviewRenderer + { +- public GridRenderer() ++ protected GridRenderer() + { + Object(); + } |