Merge #14920: windows improvements, mainly mingw

2016-05-05 08:30:19 +02:00
parent 75f1cc61b8 7a005601d4
commit 1dc36904d8
74 changed files with 4268 additions and 3425 deletions
@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite
-, pkgconfig }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, gtk3, nssTools, pcsclite }:

 stdenv.mkDerivation rec {
  name = "eid-mw-${version}";
-  version = "4.1.16";
+  version = "4.1.17";

  src = fetchFromGitHub {
-    sha256 = "14b17aa45l0pyqd87c17mgfmpgq1qmybnl6hq9mc29rxw6jdb1ka";
+    sha256 = "11d4wafcbhamkqvcfqkpz1sq66jq7bxz07m777cqsnyibccns7q6";
    rev = "v${version}";
    repo = "eid-mw";
    owner = "Fedict";
  };

-  buildInputs = [ gtk3 pcsclite ];
  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gtk3 pcsclite ];

  postPatch = ''
    sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac