From 06f9ac71dc73d1f296c31a1156162f7a6a9d3cae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 19 Dec 2015 20:39:16 -0600
Subject: [PATCH] gpsbabel: Qt 5 infrastructure update
---
pkgs/applications/misc/gpsbabel/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 172f1347f6b..c21f8bbe814 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, qt5, which }:
+{ stdenv, fetchurl, zlib, qtbase, which }:
stdenv.mkDerivation rec {
name = "gpsbabel-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w";
};
- buildInputs = [ zlib qt5.base which ];
+ buildInputs = [ zlib qtbase which ];
/* FIXME: Building the documentation, with "make doc", requires this:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0763ef94dd7..01c56dca4d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12010,7 +12010,7 @@ let
gosmore = callPackage ../applications/misc/gosmore { };
- gpsbabel = callPackage ../applications/misc/gpsbabel { };
+ gpsbabel = qt5.callPackage ../applications/misc/gpsbabel { };
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };