tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

libunity: fix build with latest vala

See: https://gitlab.gnome.org/GNOME/vala/issues/766

authored by

worldofpeace and committed by
Jan Tojnar 752ebe10 e7b7d758

+41
+5
pkgs/development/libraries/libunity/default.nix
··· 43 43 libdbusmenu 44 44 ]; 45 45 46 + patches = [ 47 + # See: https://gitlab.gnome.org/GNOME/vala/issues/766 48 + ./fix-vala.patch 49 + ]; 50 + 46 51 preConfigure = '' 47 52 intltoolize 48 53 '';
+36
pkgs/development/libraries/libunity/fix-vala.patch
··· 1 + diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala 2 + --- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 3 + +++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 4 + @@ -51,7 +51,7 @@ 5 + */ 6 + public abstract int category_index_for_scope_id (string scope_id); 7 + 8 + - public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) 9 + + protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) 10 + { 11 + Object (dbus_path: dbus_path_, id: id_, is_master: true, 12 + merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); 13 + diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala 14 + --- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500 15 + +++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400 16 + @@ -61,7 +61,7 @@ 17 + internal CategorySet _categories; 18 + internal FilterSet _filters; 19 + 20 + - public DeprecatedScopeBase (string dbus_path_, string id_) 21 + + protected DeprecatedScopeBase (string dbus_path_, string id_) 22 + { 23 + Object (dbus_path: dbus_path_, id: id_); 24 + } 25 + diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala 26 + --- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500 27 + +++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 28 + @@ -63,7 +63,7 @@ 29 + */ 30 + public abstract class GridRenderer: PreviewRenderer 31 + { 32 + - public GridRenderer() 33 + + protected GridRenderer() 34 + { 35 + Object(); 36 + }