flatpak-builder: 1.0.9 -> 1.0.10

https://github.com/flatpak/flatpak-builder/releases/tag/1.0.10

Also clean up the expression slightly:

* Use more convenient GitHub repo as homepage
* Move version into the attrset
* Fix license, it is or-later

2 files changed, 27 insertions, 17 deletions

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 1bb5c23645d66..e400051e2c661 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -29,6 +29,7 @@
 , gnumake
 , gnupg
 , gnutar
+, p7zip
 , json-glib
 , libcap
 , libdwarf
@@ -44,16 +45,15 @@
 let
   installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
   installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
-  version = "1.0.9";
 in stdenv.mkDerivation rec {
   pname = "flatpak-builder";
-  inherit version;
+  version = "1.0.10";
 
   outputs = [ "out" "doc" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "00qd770qjsiyd8qhhhyn7zg6jyi283ix5dhjzcfdn9yr3h53kvyn";
+    sha256 = "1fn61cl1d33yd1jgqm8jpffjw3xlyyhkn032g14d9gnwkcaf4649";
   };
 
   nativeBuildInputs = [
@@ -99,6 +99,7 @@ in stdenv.mkDerivation rec {
       cpio = "${cpio}/bin/cpio";
       git = "${gitMinimal}/bin/git";
       rofilesfuse = "${ostree}/bin/rofiles-fuse";
+      sevenz = "${p7zip}/bin/7z";
       strip = "${binutils}/bin/strip";
       eustrip = "${elfutils}/bin/eu-strip";
       euelfcompress = "${elfutils}/bin/eu-elfcompress";
@@ -146,8 +147,8 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool to build flatpaks from source";
-    homepage = https://flatpak.org/;
-    license = licenses.lgpl21;
+    homepage = "https://github.com/flatpak/flatpak-builder";
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch
index 6b82e623a02c4..cc7d9e82b0aff 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
-@@ -763,7 +763,7 @@
+@@ -800,7 +800,7 @@ builder_context_enable_rofiles (BuilderContext *self,
    g_autoptr(GFile) rofiles_base = NULL;
    g_autoptr(GFile) rofiles_dir = NULL;
    g_autofree char *tmpdir_name = NULL;
@@ -11,7 +11,7 @@
                     (char *)flatpak_file_get_path_cached (self->app_dir),
 --- a/src/builder-git.c
 +++ b/src/builder-git.c
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ git (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -20,7 +20,7 @@
    va_end (ap);
  
    return res;
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ cp (GError **error,
    va_list ap;
  
    va_start (ap, error);
@@ -31,7 +31,7 @@
    return res;
 --- a/src/builder-source-archive.c
 +++ b/src/builder-source-archive.c
-@@ -430,7 +430,7 @@
+@@ -443,7 +443,7 @@ tar (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -40,7 +40,7 @@
    va_end (ap);
  
    return res;
-@@ -445,7 +445,7 @@
+@@ -458,7 +458,7 @@ unzip (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -49,7 +49,16 @@
    va_end (ap);
  
    return res;
-@@ -457,7 +457,7 @@
+@@ -470,7 +470,7 @@ un7z (GFile       *dir,
+       GError     **error)
+ {
+   gboolean res;
+-  const gchar *argv[] = { "7z",  "x", sevenz_path, NULL };
++  const gchar *argv[] = { "@sevenz@",  "x", sevenz_path, NULL };
+ 
+   res = flatpak_spawnv (dir, NULL, 0, error, argv);
+ 
+@@ -483,7 +483,7 @@ unrpm (GFile   *dir,
         GError **error)
  {
    gboolean res;
@@ -58,7 +67,7 @@
        "sh", /* shell's $0 */
        rpm_path, /* shell's $1 */
        NULL };
-@@ -604,7 +604,7 @@
+@@ -631,7 +631,7 @@ git (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -69,7 +78,7 @@
    return res;
 --- a/src/builder-source-bzr.c
 +++ b/src/builder-source-bzr.c
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ bzr (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -80,7 +89,7 @@
    return res;
 --- a/src/builder-source-patch.c
 +++ b/src/builder-source-patch.c
-@@ -215,15 +215,15 @@
+@@ -247,15 +247,15 @@ patch (GFile      *dir,
  
    args = g_ptr_array_new ();
    if (use_git) {
@@ -101,7 +110,7 @@
      g_ptr_array_add (args, (gchar *) extra_options[i]);
 --- a/src/builder-utils.c
 +++ b/src/builder-utils.c
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ strip (GError **error,
    va_list ap;
  
    va_start (ap, error);
@@ -110,7 +119,7 @@
    va_end (ap);
  
    return res;
-@@ -163,7 +163,7 @@
+@@ -163,7 +163,7 @@ eu_strip (GError **error,
    va_list ap;
  
    va_start (ap, error);
@@ -119,7 +128,7 @@
    va_end (ap);
  
    return res;
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ eu_elfcompress (GError **error,
    va_list ap;
  
    va_start (ap, error);