Unverified Commit 02dda0c1 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

various: move qt6 applications to by-name (easy cases) (#476463)

parents ce63b81e 2c491b52

pkgs/applications/misc/ausweisapp/default.nix→pkgs/by-name/au/ausweisapp/package.nix

+7 −12
Original line number Diff line number Diff line
@@ -5,13 +5,8 @@ 
  testers,

  cmake,

  pkg-config,

  wrapQtAppsHook,

  qt6,

  pcsclite,

  qtscxml,

  qtsvg,

  qttools,

  qtwayland,

  qtwebsockets,

  gitUpdater,

}:

stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    cmake

    pkg-config

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];



  # The build scripts copy the entire translations directory from Qt
@@ -39,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    pcsclite

    qtscxml

    qtsvg

    qttools

    qtwayland

    qtwebsockets

    qt6.qtscxml

    qt6.qtsvg

    qt6.qttools

    qt6.qtwayland

    qt6.qtwebsockets

  ];



  passthru = {

pkgs/applications/science/astronomy/calcmysky/default.nix→pkgs/by-name/ca/calcmysky/package.nix

+6 −7
Original line number Diff line number Diff line
@@ -3,32 +3,31 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  wrapQtAppsHook,

  qt6,

  glm,

  eigen,

  qtbase,

  stellarium,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "calcmysky";

  version = "0.4.0";



  src = fetchFromGitHub {

    owner = "10110111";

    repo = "CalcMySky";

    tag = "v${version}";

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

    hash = "sha256-AuDHLgOS+Cu2xSJQVi8XfrINoh18STP1ox7JElafW3k=";

  };



  nativeBuildInputs = [

    cmake

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];

  buildInputs = [

    glm

    eigen

    qtbase

    qt6.qtbase

  ];



  cmakeFlags = [ "-DQT_VERSION=6" ];
@@ -45,4 +44,4 @@ stdenv.mkDerivation rec { 
    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ nickcao ];

  };

}
 
})

pkgs/applications/misc/copyq/default.nix→pkgs/by-name/co/copyq/package.nix

+7 −12
Original line number Diff line number Diff line
@@ -5,16 +5,11 @@ 
  fetchpatch2,

  cmake,

  ninja,

  qtbase,

  qtsvg,

  qttools,

  qtdeclarative,

  qt6,

  libXfixes,

  libXtst,

  qtwayland,

  wayland,

  pkg-config,

  wrapQtAppsHook,

  kdePackages,

}:
@@ -33,18 +28,18 @@ stdenv.mkDerivation rec { 
    cmake

    ninja

    kdePackages.extra-cmake-modules

    wrapQtAppsHook

    qt6.wrapQtAppsHook

    pkg-config

  ];



  buildInputs = [

    qtbase

    qtsvg

    qttools

    qtdeclarative

    qt6.qtbase

    qt6.qtsvg

    qt6.qttools

    qt6.qtdeclarative

    libXfixes

    libXtst

    qtwayland

    qt6.qtwayland

    wayland

    kdePackages.kconfig

    kdePackages.kstatusnotifieritem

pkgs/development/tools/documentation/doxygen/default.nix→pkgs/by-name/do/doxygen/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  python3,

  flex,

  bison,

  withGui ? false,

  qt6,

  libiconv,

  spdlog,
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { 
    fmt

    sqlite

  ]

  ++ lib.optionals (qt6 != null) [

  ++ lib.optionals withGui [

    qt6.qtbase

    qt6.wrapQtAppsHook

    qt6.qtsvg
@@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "-Duse_sys_fmt=ON"

    "-Duse_sys_sqlite3=ON"

  ]

  ++ lib.optional (qt6 != null) "-Dbuild_wizard=YES";

  ++ lib.optional withGui "-Dbuild_wizard=YES";



  # put examples in an output so people/tools can test against them

  outputs = [
@@ -89,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: { 
      off-line reference manual (in LaTeX) from a set of documented source

      files.

    '';

    platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix;

    platforms = if withGui then lib.platforms.linux else lib.platforms.unix;

  };

})

pkgs/applications/editors/focuswriter/default.nix→pkgs/by-name/fo/focuswriter/package.nix

+10 −16
Original line number Diff line number Diff line
@@ -2,41 +2,35 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  pkg-config,

  cmake,

  hunspell,

  qtbase,

  qtmultimedia,

  qttools,

  qt5compat,

  qtwayland,

  wrapQtAppsHook,

  qt6,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "focuswriter";

  version = "1.8.13";



  src = fetchFromGitHub {

    owner = "gottcode";

    repo = "focuswriter";

    rev = "v${version}";

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

    hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI=";

  };



  nativeBuildInputs = [

    pkg-config

    cmake

    qttools

    wrapQtAppsHook

    qt6.qttools

    qt6.wrapQtAppsHook

  ];

  buildInputs = [

    hunspell

    qtbase

    qtmultimedia

    qt5compat

    qtwayland

    qt6.qtbase

    qt6.qtmultimedia

    qt6.qt5compat

    qt6.qtwayland

  ];



  installFlags = [ "INSTALL_ROOT=$(out)" ];
@@ -52,4 +46,4 @@ stdenv.mkDerivation rec { 
    homepage = "https://gottcode.org/focuswriter/";

    mainProgram = "focuswriter";

  };

}
 
})