Skip to content

Commit c38f9d8

Browse files
committed
Adapt build dependencies for macOS
1 parent 13d6b69 commit c38f9d8

File tree

4 files changed

+8
-28
lines changed

4 files changed

+8
-28
lines changed

ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
88

99
datas = [
1010
(venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
11-
(venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
1211
('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
1312
('../../../LICENSE', '.')
1413
]
1514
datas += copy_metadata('ecdsa')
1615
datas += copy_metadata('fido2')
1716
datas += copy_metadata('nitrokeyapp')
18-
datas += copy_metadata('pynitrokey')
19-
datas += copy_metadata('pyusb')
20-
datas += copy_metadata('spsdk')
17+
datas += copy_metadata('nitrokey')
2118

2219
a = Analysis(
2320
['../../../nitrokeyapp/__main__.py'],
2421
pathex=[],
25-
binaries=[
26-
(venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_arm64/libusbsio.dylib', 'libusbsio')
27-
],
22+
binaries=[],
2823
datas=datas,
2924
hiddenimports=[],
3025
hookspath=[],

ci-scripts/macos/pyinstaller/nitrokey-app-onedir_intel64.spec

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
88

99
datas = [
1010
(venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
11-
(venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
1211
('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
1312
('../../../LICENSE', '.')
1413
]
1514
datas += copy_metadata('ecdsa')
1615
datas += copy_metadata('fido2')
1716
datas += copy_metadata('nitrokeyapp')
18-
datas += copy_metadata('pynitrokey')
19-
datas += copy_metadata('pyusb')
20-
datas += copy_metadata('spsdk')
17+
datas += copy_metadata('nitrokey')
2118

2219
a = Analysis(
2320
['../../../nitrokeyapp/__main__.py'],
2421
pathex=[],
25-
binaries=[
26-
(venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_x86_64/libusbsio.dylib', 'libusbsio')
27-
],
22+
binaries=[],
2823
datas=datas,
2924
hiddenimports=[],
3025
hookspath=[],

ci-scripts/macos/pyinstaller/nitrokey-app-onefile_arm64.spec

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
88

99
datas = [
1010
(venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
11-
(venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
1211
('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
1312
('../../../LICENSE', '.')
1413
]
1514
datas += copy_metadata('ecdsa')
1615
datas += copy_metadata('fido2')
1716
datas += copy_metadata('nitrokeyapp')
18-
datas += copy_metadata('pynitrokey')
19-
datas += copy_metadata('pyusb')
20-
datas += copy_metadata('spsdk')
17+
datas += copy_metadata('nitrokey')
2118

2219
a = Analysis(
2320
['../../../nitrokeyapp/__main__.py'],
2421
pathex=[],
25-
binaries=[
26-
(venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_arm64/libusbsio.dylib', 'libusbsio')
27-
],
22+
binaries=[],
2823
datas=datas,
2924
hiddenimports=[],
3025
hookspath=[],

ci-scripts/macos/pyinstaller/nitrokey-app-onefile_intel64.spec

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
88

99
datas = [
1010
(venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
11-
(venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
1211
('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
1312
('../../../LICENSE', '.')
1413
]
1514
datas += copy_metadata('ecdsa')
1615
datas += copy_metadata('fido2')
1716
datas += copy_metadata('nitrokeyapp')
18-
datas += copy_metadata('pynitrokey')
19-
datas += copy_metadata('pyusb')
20-
datas += copy_metadata('spsdk')
17+
datas += copy_metadata('nitrokey')
2118

2219
a = Analysis(
2320
['../../../nitrokeyapp/__main__.py'],
2421
pathex=[],
25-
binaries=[
26-
(venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_x86_64/libusbsio.dylib', 'libusbsio')
27-
],
22+
binaries=[],
2823
datas=datas,
2924
hiddenimports=[],
3025
hookspath=[],

0 commit comments

Comments
 (0)