Skip to content

Commit

Permalink
Merge ../builds/hammer_build_lightparam_0.4.6/overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
TyberiusPrime committed Sep 18, 2024
2 parents 5cc2bf2 + f337daf commit bd6caf7
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 0 deletions.
12 changes: 12 additions & 0 deletions collected.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down
3 changes: 3 additions & 0 deletions overrides/app/0.1.0/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_
: _old: {dontWrapQtApps = true;}

1 change: 1 addition & 0 deletions overrides/app/0.1.0/rules.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
QTDontWrap = true
3 changes: 3 additions & 0 deletions overrides/lightparam/0.4.6/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_
: _old: {dontWrapQtApps = true;}

1 change: 1 addition & 0 deletions overrides/lightparam/0.4.6/rules.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
QTDontWrap = true
49 changes: 49 additions & 0 deletions overrides/pyqt5-qt5/5.15.15/default.nix
Original file line number Diff line number Diff line change
@@ -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

2 changes: 2 additions & 0 deletions overrides/pyqt5-qt5/5.15.15/rules.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BuildInputs = [ "~literal:!:pkgs.freetype", "~literal:!:pkgs.unixODBC",]
ManualOverrides = "__file__:pyqt5-qt5/5.15.15/default.nix"
60 changes: 60 additions & 0 deletions overrides/pyqt5/5.15.11/default.nix
Original file line number Diff line number Diff line change
@@ -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

2 changes: 2 additions & 0 deletions overrides/pyqt5/5.15.11/rules.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ManualOverrides = "__file__:pyqt5/5.15.11/default.nix"
QTDontWrap = true

0 comments on commit bd6caf7

Please sign in to comment.