git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #114506 from r-ryantm/auto-update/msitools

msitools: 0.99 -> 0.100

commit388dfa5cbd037777b82446ae321f61fa7aa37585 authorJan Tojnar <jtojnar@gmail.com> dateSun 7 Mar 2021, 17:59 (6 years ago) parentc061f4b512284e
1 file changed+65−6
pkgs/development/tools/misc/msitools/default.nix+65−6
pkgs/development/tools/misc/msitools/default.nix+65−6
@@ -1,27 +1,86 @@
1−{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, fetchpatch
5+, meson
6+, ninja
7+, vala
8+, gobject-introspection
9+, perl
10+, bison
11+, gettext
12+, glib
13+, pkg-config
14+, libgsf
15+, gcab
16+, bzip2
17+, gnome3
18+}:
219
320stdenv.mkDerivation rec {
421 pname = "msitools";
5− version = "0.99";
22+ version = "0.101";
623
724 src = fetchurl {
825 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU=";
26+ sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4=";
1027 };
1128
12− nativeBuildInputs = [ bison intltool pkg-config ];
13− buildInputs = [ glib libgsf libuuid gcab bzip2 ];
29+ patches = [
30+ # Fix executable bit on tools (regression in Meson migration).
31+ (fetchpatch {
32+ url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch";
33+ sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U=";
34+ })
35+
36+ # Fix failure on big-endian platforms.
37+ # https://gitlab.gnome.org/GNOME/msitools/issues/31
38+ (fetchpatch {
39+ url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch";
40+ sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo=";
41+ })
42+ ];
43+
44+ nativeBuildInputs = [
45+ meson
46+ ninja
47+ vala
48+ gobject-introspection
49+ perl
50+ bison
51+ gettext
52+ pkg-config
53+ ];
54+
55+ buildInputs = [
56+ glib
57+ libgsf
58+ gcab
59+ bzip2
60+ ];
61+
62+ doCheck = true;
63+
64+ postPatch = ''
65+ patchShebangs subprojects/bats-core/{bin,libexec}
66+ '';
1467
1568 passthru = {
1669 updateScript = gnome3.updateScript {
1770 packageName = pname;
71+ versionPolicy = "none";
1872 };
1973 };
2074
2175 meta = with lib; {
2276 description = "Set of programs to inspect and build Windows Installer (.MSI) files";
2377 homepage = "https://wiki.gnome.org/msitools";
24− license = [ licenses.gpl2 licenses.lgpl21 ];
78+ license = with licenses; [
79+ # Library
80+ lgpl21Plus
81+ # Tools
82+ gpl2Plus
83+ ];
2584 maintainers = with maintainers; [ PlushBeaver ];
2685 platforms = platforms.unix;
2786 };