pyrox.dev
lol
Merge pull request #196812 from smaret/fix-gildas-python
gildas: restore Python support
authored by
Robert Scott
and committed by
GitHub
31acb601
788e369c
+15
-2
+2
-2
pkgs/applications/science/astronomy/gildas/default.nix
+2
-2
pkgs/applications/science/astronomy/gildas/default.nix
···
3
3
}:
4
4
5
5
let
6
-
python3Env = python3.withPackages(ps: with ps; [ numpy ]);
6
+
python3Env = python3.withPackages(ps: with ps; [ numpy setuptools ]);
7
7
in
8
8
9
9
stdenv.mkDerivation rec {
···
24
24
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
25
25
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
26
26
27
-
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
27
+
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ];
28
28
29
29
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
30
30
+13
pkgs/applications/science/astronomy/gildas/python-ldflags.patch
+13
pkgs/applications/science/astronomy/gildas/python-ldflags.patch
···
1
+
diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py
2
+
--- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200
3
+
+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200
4
+
@@ -32,7 +32,7 @@
5
+
libs.insert(0, '-L' + getvar('LIBDIR'))
6
+
7
+
# Framework (specific for Mac)
8
+
-if not getvar('PYTHONFRAMEWORK'):
9
+
- libs.extend(getvar('LINKFORSHARED').split())
10
+
+#if not getvar('PYTHONFRAMEWORK'):
11
+
+# libs.extend(getvar('LINKFORSHARED').split())
12
+
13
+
print(' '.join(libs))