public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flatpak-builder: 0.99.1 → 0.99.3

Browse Source
This commit is contained in:
Jan Tojnar 2018-07-15 19:10:02 +02:00
parent bea8e84964
commit 98792fe351
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/flatpak-builder/default.nix
View File

@ -36,7 +36,7 @@
}: }:
let let
version = "0.99.1"; version = "0.99.3";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "flatpak-builder-${version}"; name = "flatpak-builder-${version}";
@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

30
pkgs/development/tools/flatpak-builder/fix-paths.patch
View File

@ -1,6 +1,6 @@
--- a/src/builder-context.c --- a/src/builder-context.c
+++ b/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_base = NULL;
g_autoptr(GFile) rofiles_dir = NULL; g_autoptr(GFile) rofiles_dir = NULL;
g_autofree char *tmpdir_name = NULL; g_autofree char *tmpdir_name = NULL;
@ -31,7 +31,7 @@
return res; return res;
--- a/src/builder-source-archive.c --- a/src/builder-source-archive.c
+++ b/src/builder-source-archive.c +++ b/src/builder-source-archive.c
@@ -401,7 +401,7 @@ @@ -430,7 +430,7 @@
va_list ap; va_list ap;
va_start (ap, error); va_start (ap, error);
@ -40,7 +40,7 @@
va_end (ap); va_end (ap);
return res; return res;
@@ -416,7 +416,7 @@ @@ -445,7 +445,7 @@
va_list ap; va_list ap;
va_start (ap, error); va_start (ap, error);
@ -49,7 +49,7 @@
va_end (ap); va_end (ap);
return res; return res;
@@ -428,7 +428,7 @@ @@ -457,7 +457,7 @@
GError **error) GError **error)
{ {
gboolean res; gboolean res;
@ -58,6 +58,15 @@
"sh", /* shell's $0 */ "sh", /* shell's $0 */
rpm_path, /* shell's $1 */ rpm_path, /* shell's $1 */
NULL }; 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 --- a/src/builder-source-bzr.c
+++ b/src/builder-source-bzr.c +++ b/src/builder-source-bzr.c
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
@ -71,7 +80,7 @@
return res; return res;
--- a/src/builder-source-patch.c --- a/src/builder-source-patch.c
+++ b/src/builder-source-patch.c +++ b/src/builder-source-patch.c
@@ -204,11 +204,11 @@ @@ -215,15 +215,15 @@
args = g_ptr_array_new (); args = g_ptr_array_new ();
if (use_git) { if (use_git) {
@ -79,6 +88,11 @@
+ g_ptr_array_add (args, "@git@"); + g_ptr_array_add (args, "@git@");
g_ptr_array_add (args, "apply"); g_ptr_array_add (args, "apply");
g_ptr_array_add (args, "-v"); 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 { } else {
- g_ptr_array_add (args, "patch"); - g_ptr_array_add (args, "patch");
+ 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]); g_ptr_array_add (args, (gchar *) extra_options[i]);
--- a/src/builder-utils.c --- a/src/builder-utils.c
+++ b/src/builder-utils.c +++ b/src/builder-utils.c
@@ -139,7 +139,7 @@ @@ -149,7 +149,7 @@
va_list ap; va_list ap;
va_start (ap, error); va_start (ap, error);
@ -96,7 +110,7 @@
va_end (ap); va_end (ap);
return res; return res;
@@ -153,7 +153,7 @@ @@ -163,7 +163,7 @@
va_list ap; va_list ap;
va_start (ap, error); va_start (ap, error);
@ -105,7 +119,7 @@
va_end (ap); va_end (ap);
return res; return res;
@@ -167,7 +167,7 @@ @@ -177,7 +177,7 @@
va_list ap; va_list ap;
va_start (ap, error); va_start (ap, error);