diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-06 11:15:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 11:15:45 -0400 |
| commit | d6264f9094b93810ecec8e8fa4ab82c25ebaeddd (patch) | |
| tree | e3144cdd0b3896392fbd79e4219809e9bb9e1d35 /pkgs/applications/science/astronomy | |
| parent | 0b0fddea20822c042d220945fd86f5c64135dadf (diff) | |
| parent | 4f3eacc2bf2014b39ec47156733493097b83b508 (diff) | |
| download | nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.tar nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.tar.gz nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.tar.bz2 nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.tar.lz nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.tar.xz nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.tar.zst nixlib-d6264f9094b93810ecec8e8fa4ab82c25ebaeddd.zip | |
Merge pull request #65726 from smaret/gildas-20190801_a
gildas: 20190701_a -> 20190901_a
Diffstat (limited to 'pkgs/applications/science/astronomy')
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 968d8769caa3..a21c9f328f40 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif -, cfitsio , getopt , perl , groff , which +, cfitsio , getopt , perl , groff , which, darwin }: let @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jul19a"; - version = "20190701_a"; + srcVersion = "sep19a"; + version = "20190901_a"; pname = "gildas"; src = fetchurl { @@ -16,19 +16,22 @@ 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 = "97eaa0d0a0f53f0616462642a9bfaddb0305a8a0948e60531d8a524a13a370b6"; + sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; - buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; + buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ] + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} |