commit d7a3b9644063eb67a0ec267f51ccece0e1684e77 · pyrox.dev/nixpkgs

+5 -5

pkgs/development/compilers/fpc/binary.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "fpc-binary";

     

       5
       5
       -
         version = "3.2.0";

     

       5
       5
       +
         version = "3.2.2";

     

       6
       6
        
       

     

       7
       7
        
         src =

     

       8
       8
        
           if stdenv.hostPlatform.system == "i686-linux" then

     

       9
       9
        
             fetchurl {

     

       10
       10
        
               url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar";

     

       11
       11
       -
               sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411";

     

       11
       11
       +
               sha256 = "f62980ac0b2861221f79fdbff67836aa6912a4256d4192cfa4dfa0ac5b419958";

     

       12
       12
        
             }

     

       13
       13
        
           else if stdenv.hostPlatform.system == "x86_64-linux" then

     

       14
       14
        
             fetchurl {

     

       15
       15
       -
               url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar";

     

       16
       16
       -
               sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni";

     

       15
       15
       +
               url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.x86_64-linux.tar";

     

       16
       16
       +
               sha256 = "5adac308a5534b6a76446d8311fc340747cbb7edeaacfe6b651493ff3fe31e83";

     

       17
       17
        
             }

     

       18
       18
        
           else if stdenv.hostPlatform.system == "aarch64-linux" then

     

       19
       19
        
             fetchurl {

     

       20
       20
        
               url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar";

     

       21
       21
       -
               sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71";

     

       21
       21
       +
               sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451";

     

       22
       22
        
             }

     

       23
       23
        
           else throw "Not supported on ${stdenv.hostPlatform.system}.";

     

       24
       24

+2 -2

pkgs/development/compilers/fpc/default.nix

···

       3
       3
        
       let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         version = "3.2.0";

     

       6
       6
       +
         version = "3.2.2";

     

       7
       7
        
         pname = "fpc";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "0f38glyn3ffmqww432snhx2b8wyrq0yj1njkp4zh56lqrvm19fgr";

     

       11
       11
       +
           sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ startFPC gawk ];

+4 -4

pkgs/development/compilers/fpc/mark-paths.patch

···

       19
       19
        
        {$else powerpc64}

     

       20
       20
        
              LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);

     

       21
       21
        
        {$endif powerpc64}

     

       22
       22
       -
       @@ -164,7 +164,7 @@ begin

     

       23
       23
       -
              LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true);

     

       22
       22
       +
       @@ -165,7 +165,7 @@ begin

     

       24
       23
        
        {$endif i386}

     

       25
       24
        
        {$ifdef aarch64}

     

       25
       25
       +
              LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);

     

       26
       26
        
       -      LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);

     

       27
       27
        
       +      LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true);

     

       28
       28
        
        {$endif aarch64}

     

       29
       29
        
        {$ifdef powerpc}

     

       30
       30
        
              LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);

     

       31
       31
       -
       @@ -185,53 +185,53 @@ begin

     

       31
       31
       +
       @@ -186,53 +186,53 @@ begin

     

       32
       32
        
        end;

     

       33
       33
        
        

     

       34
       34
        
        {$ifdef m68k}

     
···

       95
       95
        
        {$endif sparc64}

     

       96
       96
        
        

     

       97
       97
        
        

     

       98
       98
       -
       @@ -266,9 +266,9 @@ begin

     

       98
       98
       +
       @@ -267,9 +267,9 @@ begin

     

       99
       99
        
              libctype:=uclibc;

     

       100
       100
        
            end

     

       101
       101
        
        {$ifdef i386}