tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gpsbabel: fix darwin build
Robert Helgesson
8 years ago
08656a73
1bb8a478
+10
-7
2 changed files
expand all
collapse all
unified
split
pkgs
applications
misc
gpsbabel
default.nix
top-level
all-packages.nix
+7
-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}";
···
18
18
})
19
19
];
20
20
21
21
-
buildInputs = [ zlib qt4 which ];
21
21
+
buildInputs = [ zlib qt4 which ]
22
22
+
++ lib.optionals stdenv.isDarwin [ IOKit ];
22
23
23
24
/* FIXME: Building the documentation, with "make doc", requires this:
24
25
···
40
41
patchShebangs testo
41
42
substituteInPlace testo \
42
43
--replace "-x /usr/bin/hexdump" ""
43
43
-
'' + (
44
44
+
''
44
45
# 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
-
);
46
46
+
+ lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
47
47
+
# The tomtom asc test fails on darwin, see PR #23572.
48
48
+
+ lib.optionalString stdenv.isDarwin "rm -v testo.d/tomtom_asc.test;";
48
49
49
50
meta = with stdenv.lib; {
50
51
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