diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-23 23:19:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 23:19:06 -0700 |
| commit | 093f591dbce53a35735628d07d4ecddc11d527a3 (patch) | |
| tree | 5f9c2cfe0ab2dd1653a7f5ef74671318515eca3a /pkgs/applications/science/electronics | |
| parent | a451dcf5144929bf63638d75a3f1b584b1c4ad32 (diff) | |
| parent | 003cfb2dc7f51d06ff34dde42b7274cea5fa506a (diff) | |
| download | nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.tar nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.tar.gz nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.tar.bz2 nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.tar.lz nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.tar.xz nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.tar.zst nixpkgs-093f591dbce53a35735628d07d4ecddc11d527a3.zip | |
Merge pull request #249849 from tjni/flatcam
flatcam: do not pin setuptools in shapely
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/flatcam/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 338823bbf38..169130b4101 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -13,13 +13,16 @@ let packageOverrides = self: super: { shapely = super.shapely.overridePythonAttrs (old: rec { version = "1.8.4"; + src = fetchPypi { pname = "Shapely"; inherit version; hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; }; + # Environment variable used in shapely/_buildcfg.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ # Patch to search form GOES .so/.dylib files in a Nix-aware way (substituteAll { @@ -28,6 +31,11 @@ let libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools<64' 'setuptools' + ''; }); }; }; |