gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #196812 from smaret/fix-gildas-python

Browse Source 
gildas: restore Python support
This commit is contained in:
Robert Scott
2022-10-22 17:07:30 +01:00
committed by GitHub
parent 788e369ce6 35370b7fef
commit 31acb601e3
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/astronomy/gildas/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
}:
let
python3Env = python3.withPackages(ps: with ps; [ numpy ]);
python3Env = python3.withPackages(ps: with ps; [ numpy setuptools ]);
in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
++ 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";
pkgs/applications/science/astronomy/gildas/python-ldflags.patch
+13
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))