diff --git a/pkgs/by-name/ep/epsonscan2/package.nix b/pkgs/by-name/ep/epsonscan2/package.nix index db914a676625..5c491a50f523 100644 --- a/pkgs/by-name/ep/epsonscan2/package.nix +++ b/pkgs/by-name/ep/epsonscan2/package.nix @@ -15,8 +15,7 @@ libtool, libusb1, makeDesktopItem, - qtbase, - wrapQtAppsHook, + qt5, withGui ? true, withNonFreePlugins ? false, @@ -81,7 +80,7 @@ stdenv.mkDerivation { ] ++ lib.optionals withGui [ imagemagick # to make icons - wrapQtAppsHook + qt5.wrapQtAppsHook ] ++ lib.optionals withNonFreePlugins [ autoPatchelfHook @@ -96,7 +95,7 @@ stdenv.mkDerivation { ] ++ lib.optionals withGui [ copyDesktopItems - qtbase + qt5.qtbase ] ++ lib.optionals withNonFreePlugins [ libtool.lib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b4410ba007f..413c9d330f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15443,10 +15443,6 @@ with pkgs; cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; - epsonscan2 = callPackage ../by-name/ep/epsonscan2/package.nix { - inherit (qt5) wrapQtAppsHook qtbase; - }; - foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; };