From 7450865827821efbd33a35f16bcdfb8aafd34d27 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 18:36:38 -0600 Subject: [PATCH] antimony: Qt 5 infrastructure update --- pkgs/applications/graphics/antimony/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 589d20cb1260..5e8dfd93f30e 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libpng, python3, boost, mesa, qt5, ncurses }: +{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, ncurses }: let gitRev = "745eca3a2d2657c495d5509e9083c884e021d09c"; @@ -19,7 +19,7 @@ in buildInputs = [ libpng python3 (boost.override { python = python3; }) - mesa qt5.base ncurses + mesa qtbase ncurses ]; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 824c710fb2cf..f937ef729c93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11015,7 +11015,7 @@ let amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - antimony = callPackage ../applications/graphics/antimony {}; + antimony = qt5.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {};