commit a3a75ec90853d83e041c9ac6a133a3002f89fa40 · pyrox.dev/nixpkgs

+3 -5

pkgs/development/libraries/libaal/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "1.0.6";

     

       4
       4
       +
         version = "1.0.7";

     

       5
       5
        
         pname = "libaal";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di";

     

       9
       9
       +
           sha256 = "sha256-fIVohp2PVCaNaQRVJ4zfW8mukiiqM3BgF8Vwu9qrmJE=";

     

       10
       10
        
         };

     

       11
       11
       -
       

     

       12
       12
       -
         patches = [ ./libaal-1.0.6-glibc-2.26.patch ];

     

       13
       11
        
       

     

       14
       12
        
         preInstall = ''

     

       15
       13
        
           substituteInPlace Makefile --replace ./run-ldconfig true

     
···

       21
       19
        
           homepage = "http://www.namesys.com/";

     

       22
       20
        
           description = "Support library for Reiser4";

     

       23
       21
        
           license = lib.licenses.gpl2;

     

       24
       24
       -
           maintainers = with lib.maintainers; [ ];

     

       22
       22
       +
           maintainers = with lib.maintainers; [ mglolenstine ];

     

       25
       23
        
           platforms = with lib.platforms; linux;

     

       26
       24
        
         };

     

       27
       25
        
       }

-89

pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch

···

       1
       1
       -
       Date: 2017-09-02 13:03:15.353403096 +0200

     

       2
       2
       -
       From: Jan Engelhardt <jengelh@inai.de>

     

       3
       3
       -
       

     

       4
       4
       -
       Stop redefining libc definitions that cause build failures under glibc-2.26.

     

       5
       5
       -
       

     

       6
       6
       -
       [   46s] In file included from /usr/include/sys/types.h:156:0,

     

       7
       7
       -
       [   46s]                  from /usr/include/stdlib.h:279,

     

       8
       8
       -
       [   46s]                  from malloc.c:15:

     

       9
       9
       -
       [   46s] /usr/include/bits/stdint-intn.h:27:19: error: conflicting types for 'int64_t'

     

       10
       10
       -
       [   46s]  typedef __int64_t int64_t;

     

       11
       11
       -
       [   46s]                    ^~~~~~~

     

       12
       12
       -
       [   46s] In file included from ../include/aal/libaal.h:17:0,

     

       13
       13
       -
       [   46s]                  from malloc.c:6:

     

       14
       14
       -
       [   46s] ../include/aal/types.h:35:33: note: previous declaration of 'int64_t' was here

     

       15
       15
       -
       [   46s]  typedef long long int           int64_t;

     

       16
       16
       -
       

     

       17
       17
       -
       

     

       18
       18
       -
       ---

     

       19
       19
       -
        include/aal/types.h |   48 ++----------------------------------------------

     

       20
       20
       -
        1 file changed, 2 insertions(+), 46 deletions(-)

     

       21
       21
       -
       

     

       22
       22
       -
       Index: libaal-1.0.6/include/aal/types.h

     

       23
       23
       -
       ===================================================================

     

       24
       24
       -
       --- libaal-1.0.6.orig/include/aal/types.h

     

       25
       25
       -
       +++ libaal-1.0.6/include/aal/types.h

     

       26
       26
       -
       @@ -26,24 +26,7 @@

     

       27
       27
       -
        #undef ESTRUCT

     

       28
       28
       -
        #define ESTRUCT                 50

     

       29
       29
       -
        

     

       30
       30
       -
       -#ifndef __int8_t_defined

     

       31
       31
       -
       -#define __int8_t_defined

     

       32
       32
       -
       -typedef signed char             int8_t;

     

       33
       33
       -
       -typedef short int               int16_t;

     

       34
       34
       -
       -typedef int                     int32_t;

     

       35
       35
       -
       -__extension__

     

       36
       36
       -
       -typedef long long int           int64_t;

     

       37
       37
       -
       -#endif

     

       38
       38
       -
       - 

     

       39
       39
       -
       -typedef unsigned char           uint8_t;

     

       40
       40
       -
       -typedef unsigned short int      uint16_t;

     

       41
       41
       -
       -#ifndef __uint32_t_defined

     

       42
       42
       -
       -#define __uint32_t_defined

     

       43
       43
       -
       -typedef unsigned int            uint32_t;

     

       44
       44
       -
       -__extension__

     

       45
       45
       -
       -typedef unsigned long long int  uint64_t;

     

       46
       46
       -
       -#endif

     

       47
       47
       -
       -

     

       48
       48
       -
       +#include <stdint.h>

     

       49
       49
       -
        #define MAX_UINT8  ((uint8_t)~0)

     

       50
       50
       -
        #define MAX_UINT16 ((uint16_t)~0)

     

       51
       51
       -
        #define MAX_UINT32 ((uint32_t)~0)

     

       52
       52
       -
       @@ -53,36 +36,9 @@ typedef unsigned long long int  uint64_t

     

       53
       53
       -
           because we don't want use gcc builtins in minimal mode for achive as small

     

       54
       54
       -
           binary size as possible. */

     

       55
       55
       -
        

     

       56
       56
       -
       -#ifndef ENABLE_MINIMAL

     

       57
       57
       -
        #  include <stdarg.h>

     

       58
       58
       -
       -#else

     

       59
       59
       -
       -#ifndef _VA_LIST_

     

       60
       60
       -
       -#define _VA_LIST_

     

       61
       61
       -
       -typedef char *va_list;

     

       62
       62
       -
       -#endif

     

       63
       63
       -
       -#undef va_arg

     

       64
       64
       -
       -#undef va_end

     

       65
       65
       -
       -#undef va_start

     

       66
       66
       -
       -

     

       67
       67
       -
       -#define va_end(ap)       \

     

       68
       68
       -
       -        do {} while(0);

     

       69
       69
       -
       -

     

       70
       70
       -
       -#define va_start(ap, p)  \

     

       71
       71
       -
       -        (ap = (char *)(&(p)+1))

     

       72
       72
       -
       -

     

       73
       73
       -
       -#define va_arg(ap, type) \

     

       74
       74
       -
       -        ((type *)(ap += sizeof(type)))[-1]

     

       75
       75
       -
       -#endif

     

       76
       76
       -
       -

     

       77
       77
       -
       -/* As libaal may be used without any standard headers, we need to declare NULL

     

       78
       78
       -
       -   macro here in order to avoid compilation errors. */

     

       79
       79
       -
       -#undef NULL

     

       80
       80
       -
        

     

       81
       81
       -
       -#if defined(__cplusplus)

     

       82
       82
       -
       -#  define NULL 0

     

       83
       83
       -
       -#else

     

       84
       84
       -
       -#  define NULL ((void *)0)

     

       85
       85
       -
       -#endif

     

       86
       86
       -
       +#include <stdio.h>

     

       87
       87
       -
        

     

       88
       88
       -
        /* Simple type for direction denoting */

     

       89
       89
       -
        enum aal_dir {