mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #65726 from smaret/gildas-20190801_a
gildas: 20190701_a -> 20190901_a
This commit is contained in:
commit
d6264f9094
1 changed files with 8 additions and 5 deletions
|
@ -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}
|
||||
|
|
Loading…
Reference in a new issue