Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e7ddf233a5c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a6d3df106c0d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 7, 2019

  1. appeditor: fix build with vala 0.46 

    See: donadigo/appeditor#88
    @worldofpeace
    worldofpeace committed Nov 7, 2019
    Copy the full SHA
    a6d3df1 View commit details
Showing with 27 additions and 0 deletions.
  1. +5 −0 pkgs/applications/misc/appeditor/default.nix
  2. +22 −0 pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
5 changes: 5 additions & 0 deletions pkgs/applications/misc/appeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
libgee
];

patches = [
# See: https://github.com/donadigo/appeditor/issues/88
./fix-build-vala-0.46.patch
];

postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
22 changes: 22 additions & 0 deletions pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/DesktopApp.vala b/src/DesktopApp.vala
index 0e6fa47..ebcde0c 100644
--- a/src/DesktopApp.vala
+++ b/src/DesktopApp.vala
@@ -130,7 +130,7 @@ public class AppEditor.DesktopApp : Object {

public unowned string get_path () {
if (path == null) {
- unowned string _path = info.get_string (KeyFileDesktop.KEY_PATH);
+ string _path = info.get_string (KeyFileDesktop.KEY_PATH);
if (_path == null) {
_path = "";
}
@@ -150,7 +150,7 @@ public class AppEditor.DesktopApp : Object {
}

public bool get_should_show () {
- return info.should_show () && !get_terminal ();
+ return info.should_show () && !get_terminal ();
}

public string[] get_categories () {