From c1841675f378b3d5a4100d3af5032547ca8713c0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 18:31:25 -0600 Subject: [PATCH] antimicro: Qt 5 infrastructure update --- pkgs/tools/misc/antimicro/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index a2eed9139306..1d7984ac11da 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, SDL2, qt5, xorg, fetchzip }: +{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchzip }: stdenv.mkDerivation rec { name = "antimicro-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake pkgconfig SDL2 qt5.base qt5.tools xorg.libXtst + cmake pkgconfig SDL2 qtbase qttools xorg.libXtst ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07cf2a1194d8..824c710fb2cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15252,7 +15252,7 @@ let ### MISC - antimicro = callPackage ../tools/misc/antimicro { }; + antimicro = qt5.callPackage ../tools/misc/antimicro { }; atari800 = callPackage ../misc/emulators/atari800 { };