Restore version in Qt derivation names

This commit is contained in:
Thomas Tuegel 2021-05-14 05:53:30 -05:00
parent b2ec1a072c
commit e45c0ea4cd
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
33 changed files with 33 additions and 33 deletions

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtcharts";
pname = "qtcharts";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
qtModule {
name = "qtconnectivity";
pname = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = lib.optional stdenv.isLinux bluez;
outputs = [ "out" "dev" "bin" ];

View file

@ -3,7 +3,7 @@
with lib;
qtModule {
name = "qtdeclarative";
pname = "qtdeclarative";
qtInputs = [ qtbase qtsvg ];
nativeBuildInputs = [ python3 ];
outputs = [ "out" "dev" "bin" ];

View file

@ -1,7 +1,7 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtdoc";
pname = "qtdoc";
qtInputs = [ qtdeclarative ];
outputs = [ "out" ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative, pkg-config }:
qtModule {
name = "qtgamepad";
pname = "qtgamepad";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = [ ];
nativeBuildInputs = [ pkg-config ];

View file

@ -1,7 +1,7 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtgraphicaleffects";
pname = "qtgraphicaleffects";
qtInputs = [ qtdeclarative ];
outputs = [ "out" "dev" ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, libtiff }:
qtModule {
name = "qtimageformats";
pname = "qtimageformats";
qtInputs = [ qtbase ];
propagatedBuildInputs = [ libtiff ];
}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, qtModule, qtbase, qtmultimedia }:
qtModule {
name = "qtlocation";
pname = "qtlocation";
qtInputs = [ qtbase qtmultimedia ];
outputs = [ "bin" "out" "dev" ];
qmakeFlags = lib.optional stdenv.isDarwin [

View file

@ -1,7 +1,7 @@
{ lib, qtModule, qtbase }:
qtModule {
name = "qtmacextras";
pname = "qtmacextras";
qtInputs = [ qtbase ];
meta = with lib; {
maintainers = with maintainers; [ periklis ];

View file

@ -5,7 +5,7 @@
with lib;
qtModule {
name = "qtmultimedia";
pname = "qtmultimedia";
qtInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]

View file

@ -1,6 +1,6 @@
{ qtModule, qtbase }:
qtModule {
name = "qtnetworkauth";
pname = "qtnetworkauth";
qtInputs = [ qtbase ];
}

View file

@ -1,6 +1,6 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtquickcontrols";
pname = "qtquickcontrols";
qtInputs = [ qtdeclarative ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtdeclarative }:
qtModule {
name = "qtquickcontrols2";
pname = "qtquickcontrols2";
qtInputs = [ qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -1,6 +1,6 @@
{ qtModule, qtbase, qttools }:
qtModule {
name = "qtscript";
pname = "qtscript";
qtInputs = [ qtbase qttools ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtscxml";
pname = "qtscxml";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtsensors";
pname = "qtsensors";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -1,6 +1,6 @@
{ qtModule, qtbase, qtserialport }:
qtModule {
name = "qtserialbus";
pname = "qtserialbus";
qtInputs = [ qtbase qtserialport ];
}

View file

@ -3,7 +3,7 @@
let inherit (lib) getLib optional; in
qtModule {
name = "qtserialport";
pname = "qtserialport";
qtInputs = [ qtbase ];
NIX_CFLAGS_COMPILE =
optional stdenv.isLinux

View file

@ -1,7 +1,7 @@
{ qtModule }:
qtModule {
name = "qtspeech";
pname = "qtspeech";
qtInputs = [ ];
outputs = [ "out" "dev" ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase }:
qtModule {
name = "qtsvg";
pname = "qtsvg";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -3,7 +3,7 @@
with lib;
qtModule {
name = "qttools";
pname = "qttools";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];

View file

@ -1,6 +1,6 @@
{ qtModule, qttools }:
qtModule {
name = "qttranslations";
pname = "qttranslations";
qtInputs = [ qttools ];
}

View file

@ -1,6 +1,6 @@
{ qtModule, qtbase, qtdeclarative, qtsvg, hunspell }:
qtModule {
name = "qtvirtualkeyboard";
pname = "qtvirtualkeyboard";
qtInputs = [ qtbase qtdeclarative qtsvg hunspell ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
qtModule {
name = "qtwayland";
pname = "qtwayland";
qtInputs = [ qtbase qtquickcontrols ];
buildInputs = [ wayland ];
nativeBuildInputs = [ pkg-config ];

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtwebchannel";
pname = "qtwebchannel";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -24,7 +24,7 @@
with lib;
qtModule {
name = "qtwebengine";
pname = "qtwebengine";
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
nativeBuildInputs = [
bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs

View file

@ -1,6 +1,6 @@
{ qtModule, qtbase, qtwebsockets }:
qtModule {
name = "qtwebglplugin";
pname = "qtwebglplugin";
qtInputs = [ qtbase qtwebsockets ];
}

View file

@ -22,7 +22,7 @@ let
usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0";
in
qtModule {
name = "qtwebkit";
pname = "qtwebkit";
qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ]
++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
++ optional usingAnnulenWebkitFork qtwebchannel;

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtwebsockets";
pname = "qtwebsockets";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}

View file

@ -3,7 +3,7 @@
with lib;
qtModule {
name = "qtwebview";
pname = "qtwebview";
qtInputs = [ qtdeclarative qtwebengine ];
buildInputs = optional (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreFoundation

View file

@ -1,6 +1,6 @@
{ qtModule, qtbase }:
qtModule {
name = "qtx11extras";
pname = "qtx11extras";
qtInputs = [ qtbase ];
}

View file

@ -1,7 +1,7 @@
{ qtModule, qtbase, qtdeclarative }:
qtModule {
name = "qtxmlpatterns";
pname = "qtxmlpatterns";
qtInputs = [ qtbase qtdeclarative ];
devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
}

View file

@ -7,7 +7,7 @@ let inherit (lib) licenses maintainers platforms; in
args:
let
pname = args.name;
inherit (args) pname;
version = args.version or srcs.${pname}.version;
src = args.src or srcs.${pname}.src;
in