summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorDmitry Ivankov <boltzmannrain@gmail.com>2023-11-13 20:34:06 +0100
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-11-18 17:04:59 +0100
commit0dd2238ac7fb39e9123ecc0c7332a6930397f5d2 (patch)
treea4efbfe1e64bf717e8608cbda71606880f495381 /pkgs/top-level
parentbb0fe34d79f02db24d671553db71f87313dd8c39 (diff)
downloadnixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.tar
nixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.tar.gz
nixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.tar.bz2
nixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.tar.lz
nixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.tar.xz
nixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.tar.zst
nixpkgs-0dd2238ac7fb39e9123ecc0c7332a6930397f5d2.zip
mitmproxy: fix macos build
https://hydra.nixos.org/build/240114924/nixlog/1
```
error: linking with `/nix/store/sa6hywsm1mqfyd1xakyzv4ljjsb3hawh-clang-wrapper-11.1.0/bin/cc` failed: exit status: 1
  |
...
  = note: ld: library not found for -liconv
          clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
```

after adding libiconv it starts to fail with
```
  File "/nix/store/ncs3h7zqjl3cl2cwflka40rrirb6qg1m-python3.11-mitmproxy-rs-0.3.11/lib/python3.11/site-packages/mitmproxy_rs/__init__.py", line 1, in <module>
    from .mitmproxy_rs import *
ModuleNotFoundError: No module named 'mitmproxy_macos'
```
so it needs extra module
https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos

So the fixes are
- add `libiconv` dependency to mitmproxy-rs
- add `mitmproxy-macos` python package and add it to dependencies of
  `mitmproxy-rs` and `mitmproxy` itself (otherwise import fails,
  looks like the import is sneaky because it is platform-conditional)
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0502b4eeb5..78f2c18e582 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6877,6 +6877,8 @@ self: super: with self; {
 
   mitmproxy = callPackage ../development/python-modules/mitmproxy { };
 
+  mitmproxy-macos = callPackage ../development/python-modules/mitmproxy-macos { };
+
   mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { };
 
   mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { };