diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-07 00:09:42 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-07 17:30:07 +0100 |
| commit | 512284ed147abeca5eca8a2875a8de7c0fbca810 (patch) | |
| tree | 56b8262aee4e9524cfc8070cdac766603d864b6e | |
| parent | 3a2195b7501762b6f218aeb0b9090b4a22d82306 (diff) | |
| download | nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.tar nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.tar.gz nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.tar.bz2 nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.tar.lz nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.tar.xz nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.tar.zst nixpkgs-512284ed147abeca5eca8a2875a8de7c0fbca810.zip | |
msitools: 0.99 -> 0.101
https://ftp.fau.de/gnome/sources/msitools/0.101/msitools-0.101.news
| -rw-r--r-- | pkgs/development/tools/misc/msitools/default.nix | 71 |
1 files changed, 65 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 2db336a4991..96ce9d40591 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,27 +1,86 @@ -{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, vala +, gobject-introspection +, perl +, bison +, gettext +, glib +, pkg-config +, libgsf +, gcab +, bzip2 +, gnome3 +}: stdenv.mkDerivation rec { pname = "msitools"; - version = "0.99"; + version = "0.101"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU="; + sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4="; }; - nativeBuildInputs = [ bison intltool pkg-config ]; - buildInputs = [ glib libgsf libuuid gcab bzip2 ]; + patches = [ + # Fix executable bit on tools (regression in Meson migration). + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch"; + sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U="; + }) + + # Fix failure on big-endian platforms. + # https://gitlab.gnome.org/GNOME/msitools/issues/31 + (fetchpatch { + url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch"; + sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + vala + gobject-introspection + perl + bison + gettext + pkg-config + ]; + + buildInputs = [ + glib + libgsf + gcab + bzip2 + ]; + + doCheck = true; + + postPatch = '' + patchShebangs subprojects/bats-core/{bin,libexec} + ''; passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "none"; }; }; meta = with lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = "https://wiki.gnome.org/msitools"; - license = [ licenses.gpl2 licenses.lgpl21 ]; + license = with licenses; [ + # Library + lgpl21Plus + # Tools + gpl2Plus + ]; maintainers = with maintainers; [ PlushBeaver ]; platforms = platforms.unix; }; |