treewide: move to by-name part 5

This commit is contained in:
liberodark
2026-05-21 15:31:00 +02:00
parent 086c807164
commit b25ea88e6a
26 changed files with 97 additions and 188 deletions

View File

@@ -5,10 +5,8 @@
fetchpatch,
cmake,
pkg-config,
wrapQtAppsHook,
marisa,
qttools,
qtlocation,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -37,12 +35,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
marisa
qttools
qtlocation
libsForQt5.qttools
libsForQt5.qtlocation
];
meta = {

View File

@@ -3,7 +3,7 @@
zlib,
fetchFromGitHub,
python3Packages,
wrapQtAppsHook,
libsForQt5,
}:
python3Packages.buildPythonApplication (finalAttrs: {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE=";
};
nativeBuildInputs = [ wrapQtAppsHook ];
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
propagatedBuildInputs = [
python3Packages.pyqt5

View File

@@ -2,11 +2,9 @@
stdenv,
fetchurl,
sane-backends,
qtbase,
qtsvg,
autoPatchelfHook,
lib,
wrapQtAppsHook,
libsForQt5,
}:
stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
qtsvg
libsForQt5.qtbase
libsForQt5.qtsvg
sane-backends
stdenv.cc.cc
];

View File

@@ -6,7 +6,6 @@
sox,
flac,
lame,
wrapQtAppsHook,
ffmpeg,
vorbis-tools,
pulseaudio,
@@ -15,7 +14,7 @@
opus-tools,
gst_all_1,
enableSonos ? true,
qtwayland,
libsForQt5,
}:
let
packages = [
@@ -44,7 +43,7 @@ python3Packages.buildPythonApplication {
hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4=";
};
buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland;
buildInputs = lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
propagatedBuildInputs =
with python3Packages;
(
@@ -66,7 +65,7 @@ python3Packages.buildPythonApplication {
--replace 'platform.system() == "Linux"' 'True'
'';
nativeBuildInputs = [ wrapQtAppsHook ];
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
# Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs.
# Is also I/O bound and impure, testing an actual device, so we disable.

View File

@@ -4,8 +4,7 @@
fetchurl,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
libsForQt5,
hicolor-icon-theme,
openbabel,
desktop-file-utils,
@@ -45,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
libsForQt5.qttools
libsForQt5.wrapQtAppsHook
];
buildInputs = [
hicolor-icon-theme

View File

@@ -4,11 +4,7 @@
fetchFromGitHub,
libusb1,
pkg-config,
qmake,
qttools,
wrapQtAppsHook,
qtbase,
qtwebsockets,
libsForQt5,
}:
stdenv.mkDerivation rec {
@@ -29,14 +25,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
qmake
qttools
wrapQtAppsHook
libsForQt5.qmake
libsForQt5.qttools
libsForQt5.wrapQtAppsHook
];
buildInputs = [
libusb1
qtbase
qtwebsockets
libsForQt5.qtbase
libsForQt5.qtwebsockets
];
doInstallCheck = true;

View File

@@ -2,10 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
qtsvg,
makeWrapper,
wrapQtAppsHook,
libsForQt5,
xdg-utils,
}:
@@ -21,11 +19,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
qmake
libsForQt5.qmake
makeWrapper
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [ qtsvg ];
buildInputs = [ libsForQt5.qtsvg ];
hardeningDisable = [ "format" ];

View File

@@ -4,8 +4,7 @@
fetchzip,
autoreconfHook,
pkg-config,
wrapQtAppsHook,
qtbase,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -20,16 +19,16 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoreconfHook
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
libsForQt5.qtbase
];
makeFlags = [
"MOC=${qtbase.dev}/bin/moc"
"UIC=${qtbase.dev}/bin/uic"
"MOC=${libsForQt5.qtbase.dev}/bin/moc"
"UIC=${libsForQt5.qtbase.dev}/bin/uic"
];
meta = {

View File

@@ -4,9 +4,7 @@
fetchFromGitHub,
makeWrapper,
cmake,
wrapQtAppsHook,
qtbase,
qttools,
libsForQt5,
fftw,
libusb1,
libglvnd,
@@ -26,14 +24,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
makeWrapper
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
fftw
libusb1
libglvnd
qtbase
qttools
libsForQt5.qtbase
libsForQt5.qttools
];
postPatch = ''
@@ -51,6 +49,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/OpenHantek/OpenHantek6022";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ baracoder ];
platforms = qtbase.meta.platforms;
platforms = libsForQt5.qtbase.meta.platforms;
};
}

View File

@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
qtbase,
libsForQt5,
zlib,
freetype,
libjpeg,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qtbase
libsForQt5.qtbase
];
propagatedBuildInputs = [

View File

@@ -15,8 +15,7 @@
udevCheckHook,
nix-update-script,
withGui ? true,
wrapQtAppsHook,
qtbase,
libsForQt5,
withPython ? true,
python3,
withBlueshark ? false,
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
gcc-arm-embedded
udevCheckHook
]
++ lib.optional withGui wrapQtAppsHook;
++ lib.optional withGui libsForQt5.wrapQtAppsHook;
buildInputs = [
readline
bzip2
@@ -68,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
whereami
lua
]
++ lib.optional withGui qtbase
++ lib.optional withGui libsForQt5.qtbase
++ lib.optional withPython python3
++ lib.optional withBlueshark bluez5;

View File

@@ -4,8 +4,7 @@
fetchFromGitHub,
testers,
doxygen,
qmake,
qtbase,
libsForQt5,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
doxygen
qmake
libsForQt5.qmake
];
dontWrapQtApps = true;
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
preCheck = ''
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
export QT_PLUGIN_PATH=${lib.getBin libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path.

View File

@@ -5,10 +5,7 @@
installShellFiles,
pkg-config,
cmake,
qtbase,
qtsvg,
wrapQtAppsHook,
qttools,
libsForQt5,
pugixml,
}:
let
@@ -53,13 +50,13 @@ stdenv.mkDerivation rec {
installShellFiles
pkg-config
cmake
wrapQtAppsHook
qttools
libsForQt5.wrapQtAppsHook
libsForQt5.qttools
];
buildInputs = [
qtbase
qtsvg
libsForQt5.qtbase
libsForQt5.qtsvg
pugixml
];
@@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
homepage = "https://qelectrotech.org/";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
platforms = libsForQt5.qtbase.meta.platforms;
broken = stdenv.hostPlatform.isDarwin;
};
}

View File

@@ -2,15 +2,10 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
pkg-config,
udevCheckHook,
wrapQtAppsHook,
udev,
qtmultimedia,
qtscript,
qtserialport,
qtwebsockets,
libsForQt5,
alsa-lib,
ola,
libftdi1,
@@ -31,17 +26,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
qmake
libsForQt5.qmake
pkg-config
udevCheckHook
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
udev
qtmultimedia
qtscript
qtserialport
qtwebsockets
libsForQt5.qtmultimedia
libsForQt5.qtscript
libsForQt5.qtserialport
libsForQt5.qtwebsockets
alsa-lib
ola
libftdi1

View File

@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc=";
};
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ libsForQt5.qmake ];
dontWrapQtApps = true;

View File

@@ -3,11 +3,9 @@
stdenv,
fetchFromGitHub,
boost,
qtbase,
xz,
qmake,
pkg-config,
wrapQtAppsHook,
libsForQt5,
}:
stdenv.mkDerivation rec {
@@ -27,15 +25,15 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
qtbase
libsForQt5.qtbase
xz
boost
];
nativeBuildInputs = [
qmake
libsForQt5.qmake
pkg-config
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
installFlags = [ "INSTALL_ROOT=$(out)" ];

View File

@@ -2,10 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
qmake,
wrapQtAppsHook,
qtbase,
qtcharts,
libsForQt5,
libxrandr,
libdrm,
}:
@@ -16,12 +13,12 @@ stdenv.mkDerivation rec {
version = "20200824";
nativeBuildInputs = [
qmake
wrapQtAppsHook
libsForQt5.qmake
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
qtcharts
libsForQt5.qtbase
libsForQt5.qtcharts
libxrandr
libdrm
];

View File

@@ -4,8 +4,7 @@
fetchFromGitHub,
fetchpatch,
cmake,
qtbase,
wrapQtAppsHook,
libsForQt5,
libGL,
libGLU,
}:
@@ -44,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libGL
libGLU
qtbase
libsForQt5.qtbase
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
meta = {

View File

@@ -5,9 +5,7 @@
autoreconfHook,
writeShellScriptBin,
cmake,
wrapQtAppsHook,
pkg-config,
qmake,
curl,
grantlee,
hidapi,
@@ -18,12 +16,7 @@
libxslt,
libzip,
zlib,
qtbase,
qtconnectivity,
qtlocation,
qtsvg,
qttools,
qtpositioning,
libsForQt5,
libxcomposite,
bluez,
writeScript,
@@ -84,17 +77,17 @@ let
hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c=";
};
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ libsForQt5.qmake ];
buildInputs = [
qtbase
qtlocation
libsForQt5.qtbase
libsForQt5.qtlocation
libxcomposite
];
dontWrapQtApps = true;
pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
pluginsSubdir = "lib/qt-${libsForQt5.qtbase.qtCompatVersion}/plugins";
installPhase = ''
mkdir -p $out $(dirname ${pluginsSubdir}/geoservices)
@@ -138,16 +131,16 @@ stdenv.mkDerivation {
libxml2
libxslt
libzip
qtbase
qtconnectivity
qtsvg
qttools
qtpositioning
libsForQt5.qtbase
libsForQt5.qtconnectivity
libsForQt5.qtsvg
libsForQt5.qttools
libsForQt5.qtpositioning
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
pkg-config
];

View File

@@ -1,28 +1,22 @@
{
lib,
stdenv,
env,
fetchFromGitHub,
pkg-config,
qbs,
wrapQtAppsHook,
qtbase,
qtdeclarative,
qttools,
qtwayland,
qtsvg,
libsForQt5,
zlib,
zstd,
libGL,
}:
let
qtEnv = env "tiled-qt-env" [
qtbase
qtdeclarative
qtsvg
qttools
qtwayland
qtEnv = libsForQt5.env "tiled-qt-env" [
libsForQt5.qtbase
libsForQt5.qtdeclarative
libsForQt5.qtsvg
libsForQt5.qttools
libsForQt5.qtwayland
];
in
@@ -40,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkg-config
qbs
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtEnv

View File

@@ -4,14 +4,11 @@
fetchpatch,
lib,
cmake,
qtbase,
qttools,
qtcharts,
libGLU,
libGL,
glm,
glew,
wrapQtAppsHook,
libsForQt5,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
qttools
wrapQtAppsHook
libsForQt5.qttools
libsForQt5.wrapQtAppsHook
];
buildInputs = [
qtbase
qtcharts
libsForQt5.qtbase
libsForQt5.qtcharts
libGLU
libGL
glm

View File

@@ -34,7 +34,7 @@
lang ? "en",
libGL,
libGLU,
wrapQtAppsHook,
libsForQt5,
}:
let
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
installShellFiles
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
dontWrapQtApps = true;

View File

@@ -2811,8 +2811,6 @@ with pkgs;
}
);
mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { });
maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { });
@@ -2902,8 +2900,6 @@ with pkgs;
nwdiag = with python3Packages; toPythonApplication nwdiag;
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
ola = callPackage ../applications/misc/ola {
protobuf = protobuf_21;
};
@@ -2914,8 +2910,6 @@ with pkgs;
open-interpreter = with python3Packages; toPythonApplication open-interpreter;
openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { };
openmvs = callPackage ../applications/science/misc/openmvs {
inherit (llvmPackages) openmp;
};
@@ -3088,8 +3082,6 @@ with pkgs;
po4a = perlPackages.Po4a;
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
pyinfra = with python3Packages; toPythonApplication pyinfra;
@@ -3112,14 +3104,8 @@ with pkgs;
mpi = openmpi; # this attribute should used to build MPI applications
qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;
rapidgzip = with python3Packages; toPythonApplication rapidgzip;
@@ -3228,8 +3214,6 @@ with pkgs;
strip-nondeterminism = perlPackages.strip-nondeterminism;
subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
sumorobot-manager =
python3Packages.callPackage ../applications/science/robotics/sumorobot-manager
{ };
@@ -3276,8 +3260,6 @@ with pkgs;
extraFonts = true;
};
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
tinc = callPackage ../tools/networking/tinc { };
tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
@@ -6588,8 +6570,6 @@ with pkgs;
libmicrohttpd = libmicrohttpd_1_0;
libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
libpeas = callPackage ../development/libraries/libpeas { };
libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };
@@ -6968,8 +6948,6 @@ with pkgs;
pcre2 = callPackage ../development/libraries/pcre2 { };
pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { };
inherit
(callPackage ../development/libraries/physfs {
})
@@ -7041,8 +7019,6 @@ with pkgs;
pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
quartoMinimal = quarto.override {
rWrapper = null;
python3 = null;
@@ -7267,8 +7243,6 @@ with pkgs;
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { };
structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
szurubooru = callPackage ../servers/web-apps/szurubooru { };
tclap = tclap_1_2;
@@ -7942,8 +7916,6 @@ with pkgs;
];
};
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
moodle = callPackage ../servers/web-apps/moodle { };
moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
@@ -8901,8 +8873,6 @@ with pkgs;
activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { };
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
inherit
({
pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; };
@@ -9338,12 +9308,8 @@ with pkgs;
m32edit = callPackage ../applications/audio/midas/m32edit.nix { };
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
minari = python3Packages.toPythonApplication python3Packages.minari;
molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
@@ -9641,8 +9607,6 @@ with pkgs;
lua = lua5;
};
moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
mopidyPackages = recurseIntoAttrs (
callPackages ../applications/audio/mopidy {
python = python3;
@@ -9868,8 +9832,6 @@ with pkgs;
qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };
qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };
qemu-python-utils = python3Packages.toPythonApplication (
python3Packages.qemu.override {
fuseSupport = true;
@@ -9888,8 +9850,6 @@ with pkgs;
wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { };
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
@@ -11107,8 +11067,6 @@ with pkgs;
trilinos-mpi = trilinos.override { withMPI = true; };
wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { };
wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { };
### SCIENCE/MOLECULAR-DYNAMICS
@@ -11375,8 +11333,6 @@ with pkgs;
python3 = python312; # fails to build otherwise
};
vite = libsForQt5.callPackage ../applications/science/misc/vite { };
### SCIENCE / PHYSICS
hepmc3 = callPackage ../development/libraries/physics/hepmc3 {