nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

gildas: 20221001_b -> 20230201_a

Browse Source
This commit is contained in:
Sébastien Maret
2023-02-14 10:44:51 +01:00
parent cc443761cb
commit 9a5dbeaee1
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/astronomy/gildas/default.nix
View File

@@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "oct22b";
version = "20221001_b";
srcVersion = "feb23a";
version = "20230201_a";
pname = "gildas";
src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk=";
sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE=";
};
nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ];
@@ -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 ./python-ldflags.patch ];
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

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

@@ -1,13 +0,0 @@
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))