diff --git a/collected.nix b/collected.nix index fbeeed077..3da05739a 100644 --- a/collected.nix +++ b/collected.nix @@ -244,6 +244,9 @@ apkutils2 = { "1.0.0" = import ./overrides/apkutils2/1.0.0; }; + app = { + "0.1.0" = import ./overrides/app/0.1.0; + }; appium-python-client = { "4.1.0" = import ./overrides/appium-python-client/4.1.0; }; @@ -3581,6 +3584,9 @@ lifxlan = { "1.2.7" = import ./overrides/lifxlan/1.2.7; }; + lightparam = { + "0.4.6" = import ./overrides/lightparam/0.4.6; + }; lightwave2 = { "0.8.23" = import ./overrides/lightwave2/0.8.23; }; @@ -5743,6 +5749,12 @@ pyqrcode = { "1.2.1" = import ./overrides/pyqrcode/1.2.1; }; + pyqt5 = { + "5.15.11" = import ./overrides/pyqt5/5.15.11; + }; + pyqt5-qt5 = { + "5.15.15" = import ./overrides/pyqt5-qt5/5.15.15; + }; pyquerystring = { "1.1" = import ./overrides/pyquerystring/1.1; }; diff --git a/overrides/app/0.1.0/default.nix b/overrides/app/0.1.0/default.nix new file mode 100644 index 000000000..d8a903b89 --- /dev/null +++ b/overrides/app/0.1.0/default.nix @@ -0,0 +1,3 @@ +_ + : _old: {dontWrapQtApps = true;} + \ No newline at end of file diff --git a/overrides/app/0.1.0/rules.toml b/overrides/app/0.1.0/rules.toml new file mode 100644 index 000000000..1e4e686d5 --- /dev/null +++ b/overrides/app/0.1.0/rules.toml @@ -0,0 +1 @@ +QTDontWrap = true diff --git a/overrides/lightparam/0.4.6/default.nix b/overrides/lightparam/0.4.6/default.nix new file mode 100644 index 000000000..d8a903b89 --- /dev/null +++ b/overrides/lightparam/0.4.6/default.nix @@ -0,0 +1,3 @@ +_ + : _old: {dontWrapQtApps = true;} + \ No newline at end of file diff --git a/overrides/lightparam/0.4.6/rules.toml b/overrides/lightparam/0.4.6/rules.toml new file mode 100644 index 000000000..1e4e686d5 --- /dev/null +++ b/overrides/lightparam/0.4.6/rules.toml @@ -0,0 +1 @@ +QTDontWrap = true diff --git a/overrides/pyqt5-qt5/5.15.15/default.nix b/overrides/pyqt5-qt5/5.15.15/default.nix new file mode 100644 index 000000000..1ab37873f --- /dev/null +++ b/overrides/pyqt5-qt5/5.15.15/default.nix @@ -0,0 +1,49 @@ +{prev, pkgs, ...} + : + old: + let funcs = [(old: old // {buildInputs = old.buildInputs or [] ++ [pkgs.freetype pkgs.unixODBC];}) (old: old // ( let + inherit (pkgs) lib; + selectQt5 = version: let + selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version)); + in + pkgs."qt${selector}" or pkgs.qt5; + + qt5 = selectQt5 prev.pyqt5-qt5.version; + pyQt5Modules = qt5: + with qt5; [ + qt3d + qtbase + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qtgamepad + qtlocation + qtmultimedia + qtsensors + qtserialport + qtsvg + qtwebchannel + qtwebengine + qtwebsockets + qtx11extras + qtxmlpatterns + ]; +in { + dontWrapQtApps = true; + propagatedBuildInputs = + old.propagatedBuildInputs + or [] + ++ pyQt5Modules qt5 + ++ [ + pkgs.gtk3 + pkgs.speechd + pkgs.postgresql + pkgs.unixODBC + ]; + autoPatchelfIgnoreMissingDeps = ["libQt5Bodymovin.so.5"]; # no clue if this is correct. +} +))]; + in + pkgs.lib.trivial.pipe old funcs + \ No newline at end of file diff --git a/overrides/pyqt5-qt5/5.15.15/rules.toml b/overrides/pyqt5-qt5/5.15.15/rules.toml new file mode 100644 index 000000000..6fb840bea --- /dev/null +++ b/overrides/pyqt5-qt5/5.15.15/rules.toml @@ -0,0 +1,2 @@ +BuildInputs = [ "~literal:!:pkgs.freetype", "~literal:!:pkgs.unixODBC",] +ManualOverrides = "__file__:pyqt5-qt5/5.15.15/default.nix" diff --git a/overrides/pyqt5/5.15.11/default.nix b/overrides/pyqt5/5.15.11/default.nix new file mode 100644 index 000000000..7aff3e56f --- /dev/null +++ b/overrides/pyqt5/5.15.11/default.nix @@ -0,0 +1,60 @@ +{final, prev, pkgs, ...} + : + old: + let funcs = [(old: old // {dontWrapQtApps = true;}) (old: old // ( let + inherit (pkgs) lib; + selectQt5 = version: let + selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version)); + in + pkgs."qt${selector}" or pkgs.qt5; + + qt5 = selectQt5 prev.pyqt5-qt5.version; + pyQt5Modules = qt5: + with qt5; [ + qt3d + qtbase + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qtgamepad + qtlocation + qtmultimedia + qtsensors + qtserialport + qtsvg + qtwebchannel + qtwebengine + qtwebsockets + qtx11extras + qtxmlpatterns + qtquick3d + qtremoteobjects + qttools + + ]; +in { + postPatch = '' + # Confirm license, if project.py exists + if test -f project.py; then + sed -i s/"if tool == 'pep517':"/"if True:"/ project.py + fi + ''; + + dontConfigure = true; + dontWrapQtApps = true; + nativeBuildInputs = + old.nativeBuildInputs + or [] + ++ pyQt5Modules qt5 + ++ [ + final.pyqt-builder + final.sip + ]; + buildInputs = old.buildInputs or [] ++ pyQt5Modules qt5; + autoPatchelfIgnoreMissingDeps = ["libQt5TextToSpeech.so.5"]; # no clue if this is correct. +} +))]; + in + pkgs.lib.trivial.pipe old funcs + \ No newline at end of file diff --git a/overrides/pyqt5/5.15.11/rules.toml b/overrides/pyqt5/5.15.11/rules.toml new file mode 100644 index 000000000..1d424fde5 --- /dev/null +++ b/overrides/pyqt5/5.15.11/rules.toml @@ -0,0 +1,2 @@ +ManualOverrides = "__file__:pyqt5/5.15.11/default.nix" +QTDontWrap = true