diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:39:16 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:48 -0600 |
commit | 06f9ac71dc73d1f296c31a1156162f7a6a9d3cae (patch) | |
tree | 57b713d7c8bd755b3ce379c9c6b018496595f4a8 /pkgs | |
parent | 121f944d0df29eebabd5fa91a5ecc69c0a549a0e (diff) | |
download | nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.tar nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.tar.gz nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.tar.bz2 nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.tar.lz nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.tar.xz nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.tar.zst nixpkgs-06f9ac71dc73d1f296c31a1156162f7a6a9d3cae.zip |
gpsbabel: Qt 5 infrastructure update
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/gpsbabel/default.nix | 4 | ||||
-rw-r--r-- | 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 { }; |