commit d55ab1a6b93b28188f3cc136f794325dd9391604 · pyrox.dev/nixpkgs

+22

pkgs/applications/misc/gpsbabel/clang-4.patch

···

       1
       1
       +
       diff --git a/bushnell.cc b/bushnell.cc

     

       2
       2
       +
       index 8fa844d..40707c4 100644

     

       3
       3
       +
       --- a/bushnell.cc

     

       4
       4
       +
       +++ b/bushnell.cc

     

       5
       5
       +
       @@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name)

     

       6
       6
       +
            name = "Waypoint";

     

       7
       7
       +
          }

     

       8
       8
       +
       

     

       9
       9
       +
       -  for (t = bushnell_icons; t->icon > 0; t++) {

     

       10
       10
       +
       +  for (t = bushnell_icons; t->icon != 0; t++) {

     

       11
       11
       +
            if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {

     

       12
       12
       +
              return t->symbol;

     

       13
       13
       +
            }

     

       14
       14
       +
       @@ -147,7 +147,7 @@ static const char*

     

       15
       15
       +
        bushnell_get_name_from_symbol(signed int s)

     

       16
       16
       +
        {

     

       17
       17
       +
          icon_mapping_t* t;

     

       18
       18
       +
       -  for (t = bushnell_icons; t->icon > 0; t++) {

     

       19
       19
       +
       +  for (t = bushnell_icons; t->icon != 0; t++) {

     

       20
       20
       +
            if (s == t->symbol) {

     

       21
       21
       +
              return t->icon;

     

       22
       22
       +
            }

+8 -6

pkgs/applications/misc/gpsbabel/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, zlib, qt4, which }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "gpsbabel-${version}";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = [

     

       15
       15
       +
           ./clang-4.patch

     

       15
       16
        
           (fetchpatch {

     

       16
       17
        
             url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;

     

       17
       18
        
             sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";

     

       18
       19
        
           })

     

       19
       20
        
         ];

     

       20
       21
        
       

     

       21
       21
       -
         buildInputs = [ zlib qt4 which ];

     

       22
       22
       +
         buildInputs = [ zlib qt4 which ]

     

       23
       23
       +
           ++ lib.optionals stdenv.isDarwin [ IOKit ];

     

       22
       24
        
       

     

       23
       25
        
         /* FIXME: Building the documentation, with "make doc", requires this:

     

       24
       26
        
       

     
···

       40
       42
        
           patchShebangs testo

     

       41
       43
        
           substituteInPlace testo \

     

       42
       44
        
             --replace "-x /usr/bin/hexdump" ""

     

       43
       43
       -
         '' + (

     

       45
       45
       +
         ''

     

       44
       46
        
           # The raymarine and gtm tests fail on i686 despite -ffloat-store.

     

       45
       45
       -
           if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"

     

       46
       46
       -
           else ""

     

       47
       47
       -
         );

     

       47
       47
       +
         + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"

     

       48
       48
       +
           # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.

     

       49
       49
       +
         + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";

     

       48
       50
        
       

     

       49
       51
        
         meta = with stdenv.lib; {

     

       50
       52
        
           description = "Convert, upload and download data from GPS and Map programs";

+3 -1

pkgs/top-level/all-packages.nix

···

       13985
       13985
        
       

     

       13986
       13986
        
         gosmore = callPackage ../applications/misc/gosmore { };

     

       13987
       13987
        
       

     

       13988
       13988
       -
         gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };

     

       13988
       13988
       +
         gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {

     

       13989
       13989
       +
           inherit (darwin) IOKit;

     

       13990
       13990
       +
         };

     

       13989
       13991
        
       

     

       13990
       13992
        
         gpscorrelate = callPackage ../applications/misc/gpscorrelate { };

     

       13991
       13993