···

       
25
       
25
       
 
       
in

     

       
26
       
26
       
 
       
stdenv.mkDerivation rec {

     

       
27
       
27
       
 
       
  pname = "shishi";

     

       
28
       
28
       
-
       
  version = "1.0.2";

     

       
28
       
28
       
+
       
  version = "1.0.3";

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  src = fetchurl {

     

       
31
       
31
       
 
       
    url = "mirror://gnu/shishi/shishi-${version}.tar.gz";

     

       
32
       
32
       
-
       
    sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";

     

       
32
       
32
       
+
       
    hash = "sha256-lXmP/RLdAaT4jgMR7gPKSibly05ekFmkDk/E2fKRfpI=";

     

       
33
       
33
       
 
       
  };

     

       
34
       
34
       
 
       


     

       
35
       
35
       
 
       
  separateDebugInfo = true;

     

       
36
       
36
       
-
       


     

       
37
       
37
       
-
       
  # Fixes support for gcrypt 1.6+

     

       
38
       
38
       
-
       
  patches = [

     

       
39
       
39
       
-
       
    ./gcrypt-fix.patch

     

       
40
       
40
       
-
       
    ./freebsd-unistd.patch

     

       
41
       
41
       
-
       
  ];

     

       
42
       
36
       
 
       


     

       
43
       
37
       
 
       
  nativeBuildInputs = [ pkg-config ];

     

       
44
       
38
       
 
       
  buildInputs = [

     

···

       
1
       
1
       
-
       
diff --git a/gl/unistd.in.h b/gl/unistd.in.h

     

       
2
       
2
       
-
       
index 2ea9af4..ed58960 100644

     

       
3
       
3
       
-
       
--- a/gl/unistd.in.h

     

       
4
       
4
       
-
       
+++ b/gl/unistd.in.h

     

       
5
       
5
       
-
       
@@ -116,6 +116,7 @@

     

       
6
       
6
       
-
       
 # include <getopt.h>

     

       
7
       
7
       
-
       
 #endif

     

       
8
       
8
       
-
       
 

     

       
9
       
9
       
-
       
+#include "config.h"

     

       
10
       
10
       
-
       
 _GL_INLINE_HEADER_BEGIN

     

       
11
       
11
       
-
       
 #ifndef _GL_UNISTD_INLINE

     

       
12
       
12
       
-
       
 # define _GL_UNISTD_INLINE _GL_INLINE

     

···

       
1
       
1
       
-
       
diff --git a/configure b/configure

     

       
2
       
2
       
-
       
index c9a442b..a596bfe 100755

     

       
3
       
3
       
-
       
--- a/configure

     

       
4
       
4
       
-
       
+++ b/configure

     

       
5
       
5
       
-
       
@@ -24491,12 +24491,6 @@ else

     

       
6
       
6
       
-
       
 /* end confdefs.h.  */

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
 #include <gcrypt.h>

     

       
9
       
9
       
-
       
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c

     

       
10
       
10
       
-
       
-   will fail on startup if we don't have 1.4.4 or later, so

     

       
11
       
11
       
-
       
-   test for it early. */

     

       
12
       
12
       
-
       
-#if !defined GCRY_MODULE_ID_USER

     

       
13
       
13
       
-
       
-error too old libgcrypt

     

       
14
       
14
       
-
       
-#endif

     

       
15
       
15
       
-
       
 

     

       
16
       
16
       
-
       
 int

     

       
17
       
17
       
-
       
 main ()

     

       
18
       
18
       
-
       
diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4

     

       
19
       
19
       
-
       
index b352e33..4bab9f4 100644

     

       
20
       
20
       
-
       
--- a/gl/m4/gc.m4

     

       
21
       
21
       
-
       
+++ b/gl/m4/gc.m4

     

       
22
       
22
       
-
       
@@ -12,12 +12,6 @@ AC_DEFUN([gl_GC],

     

       
23
       
23
       
-
       
   if test "$libgcrypt" != no; then

     

       
24
       
24
       
-
       
     AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [

     

       
25
       
25
       
-
       
 #include <gcrypt.h>

     

       
26
       
26
       
-
       
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c

     

       
27
       
27
       
-
       
-   will fail on startup if we don't have 1.4.4 or later, so

     

       
28
       
28
       
-
       
-   test for it early. */

     

       
29
       
29
       
-
       
-#if !defined GCRY_MODULE_ID_USER

     

       
30
       
30
       
-
       
-error too old libgcrypt

     

       
31
       
31
       
-
       
-#endif

     

       
32
       
32
       
-
       
 ])

     

       
33
       
33
       
-
       
   fi

     

       
34
       
34
       
-
       
 ])