From 2d56a18c3ee4f4f199c2884f765b5b8e84bc72cd Mon Sep 17 00:00:00 2001 From: James Atkins Date: Tue, 19 Nov 2024 19:19:31 -0600 Subject: [PATCH] epsonscan2: move to pkgs/by-name --- pkgs/{misc/drivers => by-name/ep}/epsonscan2/build.patch | 0 .../default.nix => by-name/ep/epsonscan2/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/{misc/drivers => by-name/ep}/epsonscan2/build.patch (100%) rename pkgs/{misc/drivers/epsonscan2/default.nix => by-name/ep/epsonscan2/package.nix} (100%) diff --git a/pkgs/misc/drivers/epsonscan2/build.patch b/pkgs/by-name/ep/epsonscan2/build.patch similarity index 100% rename from pkgs/misc/drivers/epsonscan2/build.patch rename to pkgs/by-name/ep/epsonscan2/build.patch diff --git a/pkgs/misc/drivers/epsonscan2/default.nix b/pkgs/by-name/ep/epsonscan2/package.nix similarity index 100% rename from pkgs/misc/drivers/epsonscan2/default.nix rename to pkgs/by-name/ep/epsonscan2/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6743c8d357fc..0fd2c9934860 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17917,7 +17917,9 @@ with pkgs; cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; - epsonscan2 = pkgs.libsForQt5.callPackage ../misc/drivers/epsonscan2 { }; + 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; };