From 6525bbc06a39f26750ad8ee0d40000ddfdc24acb Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 12 Aug 2021 18:21:20 +0200 Subject: [PATCH] unetbootin: use libsForQt5.callPackage (#133520) --- pkgs/tools/cd-dvd/unetbootin/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index f80f60608470..88fab512b0b8 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -2,10 +2,12 @@ , stdenv , coreutils , fetchFromGitHub -, libsForQt5 , mtools , p7zip -, qt5 +, wrapQtAppsHook +, qtbase +, qttools +, qmake , syslinux , util-linux , which @@ -27,14 +29,12 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qt5.qtbase - qt5.qttools - libsForQt5.qmake + qtbase + qttools + qmake ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ wrapQtAppsHook ]; # Lots of nice hard-coded paths... postPatch = '' @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to create bootable live USB drives from ISO images"; - homepage = "http://unetbootin.github.io/"; + homepage = "https://unetbootin.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a4be3fbeb8..2296fea133fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9678,7 +9678,7 @@ with pkgs; umlet = callPackage ../tools/misc/umlet { }; - unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; + unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { };