BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gildas: restore Python support

Browse source
This commit is contained in:
Sébastien Maret 2022-10-19 22:12:52 +02:00
parent d2cfe468f8
commit 35370b7fef
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/science/astronomy/gildas/default.nix
View file

@ -3,7 +3,7 @@
}: }:
let let
python3Env = python3.withPackages(ps: with ps; [ numpy ]); python3Env = python3.withPackages(ps: with ps; [ numpy setuptools ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

13
pkgs/applications/science/astronomy/gildas/python-ldflags.patch Normal file
View file

@ -0,0 +1,13 @@
diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py
--- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200
+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200
@@ -32,7 +32,7 @@
libs.insert(0, '-L' + getvar('LIBDIR'))
# Framework (specific for Mac)
-if not getvar('PYTHONFRAMEWORK'):
- libs.extend(getvar('LINKFORSHARED').split())
+#if not getvar('PYTHONFRAMEWORK'):
+# libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs))