flatpak-builder: 0.99.1 → 0.99.3

2 files changed, 24 insertions, 10 deletions

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 5552bdcc5e6c..377791007a36 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -36,7 +36,7 @@
 }:
 
 let
-  version = "0.99.1";
+  version = "0.99.3";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5";
+    sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch
index 001ddd645683..6b82e623a02c 100644
--- a/pkgs/development/tools/flatpak-builder/fix-paths.patch
+++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch
@@ -1,6 +1,6 @@
 --- a/src/builder-context.c
 +++ b/src/builder-context.c
-@@ -711,7 +711,7 @@
+@@ -763,7 +763,7 @@
    g_autoptr(GFile) rofiles_base = NULL;
    g_autoptr(GFile) rofiles_dir = NULL;
    g_autofree char *tmpdir_name = NULL;
@@ -31,7 +31,7 @@
    return res;
 --- a/src/builder-source-archive.c
 +++ b/src/builder-source-archive.c
-@@ -401,7 +401,7 @@
+@@ -430,7 +430,7 @@
    va_list ap;
  
    va_start (ap, error);
@@ -40,7 +40,7 @@
    va_end (ap);
  
    return res;
-@@ -416,7 +416,7 @@
+@@ -445,7 +445,7 @@
    va_list ap;
  
    va_start (ap, error);
@@ -49,7 +49,7 @@
    va_end (ap);
  
    return res;
-@@ -428,7 +428,7 @@
+@@ -457,7 +457,7 @@
         GError **error)
  {
    gboolean res;
@@ -58,6 +58,15 @@
        "sh", /* shell's $0 */
        rpm_path, /* shell's $1 */
        NULL };
+@@ -604,7 +604,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, NULL, 0, error, "git", ap);
++  res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap);
+   va_end (ap);
+ 
+   return res;
 --- a/src/builder-source-bzr.c
 +++ b/src/builder-source-bzr.c
 @@ -124,7 +124,7 @@
@@ -71,7 +80,7 @@
    return res;
 --- a/src/builder-source-patch.c
 +++ b/src/builder-source-patch.c
-@@ -204,11 +204,11 @@
+@@ -215,15 +215,15 @@
  
    args = g_ptr_array_new ();
    if (use_git) {
@@ -79,6 +88,11 @@
 +    g_ptr_array_add (args, "@git@");
      g_ptr_array_add (args, "apply");
      g_ptr_array_add (args, "-v");
+   } else if (use_git_am) {
+-    g_ptr_array_add (args, "git");
++    g_ptr_array_add (args, "@git@");
+     g_ptr_array_add (args, "am");
+     g_ptr_array_add (args, "--keep-cr");
    } else {
 -    g_ptr_array_add (args, "patch");
 +    g_ptr_array_add (args, "@patch@");
@@ -87,7 +101,7 @@
      g_ptr_array_add (args, (gchar *) extra_options[i]);
 --- a/src/builder-utils.c
 +++ b/src/builder-utils.c
-@@ -139,7 +139,7 @@
+@@ -149,7 +149,7 @@
    va_list ap;
  
    va_start (ap, error);
@@ -96,7 +110,7 @@
    va_end (ap);
  
    return res;
-@@ -153,7 +153,7 @@
+@@ -163,7 +163,7 @@
    va_list ap;
  
    va_start (ap, error);
@@ -105,7 +119,7 @@
    va_end (ap);
  
    return res;
-@@ -167,7 +167,7 @@
+@@ -177,7 +177,7 @@
    va_list ap;
  
    va_start (ap, error);