diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/flatpak-builder/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/flatpak-builder/default.nix | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index cc1a46c834b5..ce3420fd911b 100644 --- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -21,6 +21,7 @@ , coreutils , cpio , curl +, debugedit , elfutils , flatpak , gitMinimal @@ -46,44 +47,15 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.14"; + version = "1.2.0"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-abZa9PY4BBJ1GMVFGE+d/JqTWM3tqr7yseUGI64rjYs="; + sha256 = "sha256-38tqPKONYeB3W3CkaatQUoXhKTYUYt8JAE5tQlHCRqg="; }; - nativeBuildInputs = [ - autoreconfHook - docbook_xml_dtd_412 - docbook_xml_dtd_42 - docbook_xml_dtd_43 - docbook_xsl - gettext - libxml2 - libxslt - pkg-config - xmlto - ]; - - buildInputs = [ - acl - bzip2 - curl - elfutils - flatpak - glib - json-glib - libcap - libdwarf - libsoup - libxml2 - libyaml - ostree - ]; - patches = [ # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch @@ -113,8 +85,41 @@ in stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ + autoreconfHook + # TODO: Remove older versions. + # https://github.com/flatpak/flatpak-builder/pull/437 + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + docbook_xsl + gettext + libxml2 + libxslt + pkg-config + xmlto + ]; + + buildInputs = [ + acl + bzip2 + curl + debugedit + elfutils + flatpak + glib + json-glib + libcap + libdwarf + libsoup + libxml2 + libyaml + ostree + ]; + configureFlags = [ "--enable-installed-tests" + "--with-system-debugedit" ]; makeFlags = [ @@ -125,6 +130,8 @@ in stdenv.mkDerivation rec { # Some scripts used by tests need to use shebangs that are available in Flatpak runtimes. dontPatchShebangs = true; + enableParallelBuilding = true; + # Installed tests postFixup = '' for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh}; do |