Unverified Commit 0a597d73 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

epsonscan2: move qt5 out of toplevel (#428843)

parents dc4753f0 750c1642

pkgs/by-name/ep/epsonscan2/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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;

  };