Unverified Commit 6c8bc225 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

various: move qt6 applications to by-name, part 2 (#485734)

parents 2429ed3c f0450cc2

pkgs/applications/office/beamerpresenter/default.nix→pkgs/by-name/be/beamerpresenter/package.nix

+13 −19
Original line number Diff line number Diff line
@@ -5,16 +5,10 @@ 
  cmake,

  pkg-config,

  wrapGAppsHook3,

  wrapQtAppsHook,

  gst_all_1,

  qtbase,

  qtsvg,

  qtmultimedia,

  qttools,

  qtwayland,

  zlib,

  # only required when using poppler

  poppler,

  qt6,

  qt6Packages,

  # only required when using mupdf

  freetype,

  gumbo,
@@ -27,14 +21,14 @@ 
  useExternalRenderer ? false,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "beamerpresenter";

  version = "0.2.6";



  src = fetchFromGitHub {

    owner = "beamerpresenter";

    repo = "BeamerPresenter";

    rev = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";

  };
@@ -42,7 +36,7 @@ stdenv.mkDerivation rec { 
    cmake

    pkg-config

    wrapGAppsHook3

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];



  dontWrapGApps = true;
@@ -52,13 +46,13 @@ stdenv.mkDerivation rec { 
    gst_all_1.gst-plugins-base

    gst_all_1.gst-plugins-good

    zlib

    qtbase

    qtsvg

    qtmultimedia

    qttools

    qt6.qtbase

    qt6.qtsvg

    qt6.qtmultimedia

    qt6.qttools

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

    qtwayland

    qt6.qtwayland

  ]

  ++ lib.optionals useMupdf [

    freetype
@@ -68,7 +62,7 @@ stdenv.mkDerivation rec { 
    openjpeg

  ]

  ++ lib.optionals usePoppler [

    poppler

    qt6Packages.poppler

  ];



  cmakeFlags = [
@@ -81,7 +75,7 @@ stdenv.mkDerivation rec { 
    "-DLINK_MUJS=OFF"

    "-DLINK_GUMBO=ON"

    "-DUSE_TRANSLATIONS=ON"

    "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}"

    "-DQT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}"

  ];



  preFixup = ''
@@ -102,4 +96,4 @@ stdenv.mkDerivation rec { 
    ];

    mainProgram = "beamerpresenter";

  };

}
 
})

pkgs/applications/misc/goldendict-ng/default.nix→pkgs/by-name/go/goldendict-ng/package.nix

+9 −16
Original line number Diff line number Diff line
@@ -17,14 +17,7 @@ 
  bzip2,

  libiconv,

  libxtst,

  qtbase,

  qtsvg,

  qtwebengine,

  qttools,

  qtwayland,

  qt5compat,

  qtmultimedia,

  wrapQtAppsHook,

  qt6,

  wrapGAppsHook3,

}:
@@ -44,18 +37,18 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    pkg-config

    cmake

    wrapQtAppsHook

    qt6.wrapQtAppsHook

    wrapGAppsHook3

  ];



  buildInputs = [

    qtbase

    qtsvg

    qttools

    qtwebengine

    qt5compat

    qtmultimedia

    qtwayland

    qt6.qtbase

    qt6.qtsvg

    qt6.qttools

    qt6.qtwebengine

    qt6.qt5compat

    qt6.qtmultimedia

    qt6.qtwayland

    libvorbis

    tomlplusplus

    fmt

pkgs/applications/misc/kemai/default.nix→pkgs/by-name/ke/kemai/package.nix

+7 −14
Original line number Diff line number Diff line
@@ -6,19 +6,12 @@ 
  # buildInputs

  libxscrnsaver,

  magic-enum,



  # nativeBuildInputs

  qtbase,

  qtconnectivity,

  qtlanguageserver,

  qttools,

  qt6,

  range-v3,

  spdlog,

  qtwayland,



  # nativeBuildInputs

  cmake,

  wrapQtAppsHook,



  # passthru

  nix-update-script,
@@ -47,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    libxscrnsaver

    magic-enum

    qtbase

    qtconnectivity

    qtlanguageserver

    qttools

    qt6.qtbase

    qt6.qtconnectivity

    qt6.qtlanguageserver

    qt6.qttools

    range-v3

    spdlog

  ]

  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;

  ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;



  cmakeFlags = [

    (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
@@ -63,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    cmake

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];



  passthru = {

pkgs/applications/misc/kiwix/default.nix→pkgs/by-name/ki/kiwix/package.nix

+7 −12
Original line number Diff line number Diff line
@@ -5,12 +5,7 @@ 
  nix-update-script,

  libkiwix,

  pkg-config,

  qmake,

  qtbase,

  qtwebengine,

  qtsvg,

  qtimageformats,

  wrapQtAppsHook,

  qt6,

  aria2,

}:
@@ -30,17 +25,17 @@ stdenv.mkDerivation rec { 
  ];



  nativeBuildInputs = [

    qmake

    qt6.qmake

    pkg-config

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];



  buildInputs = [

    libkiwix

    qtbase

    qtwebengine

    qtsvg

    qtimageformats

    qt6.qtbase

    qt6.qtwebengine

    qt6.qtsvg

    qt6.qtimageformats

  ];



  qtWrapperArgs = [