diff options
| author | Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr> | 2018-07-21 13:09:33 +0200 |
|---|---|---|
| committer | Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr> | 2018-07-21 13:21:06 +0200 |
| commit | 9092083e9ed5698322f735ae3adf09cf49d0f960 (patch) | |
| tree | 8e994e887dcc2c35219a9f75af18457853f2e241 /pkgs/applications/science/astronomy | |
| parent | 8ae9e7ef103938f2f07353f7e9c813068f024253 (diff) | |
| download | nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.tar nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.tar.gz nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.tar.bz2 nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.tar.lz nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.tar.xz nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.tar.zst nixlib-9092083e9ed5698322f735ae3adf09cf49d0f960.zip | |
gildas: fix architecture detection for aarch64
Diffstat (limited to 'pkgs/applications/science/astronomy')
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/aarch64.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/pkgs/applications/science/astronomy/gildas/aarch64.patch new file mode 100644 index 000000000000..40696a03dec7 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/aarch64.patch @@ -0,0 +1,12 @@ +diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh +--- gildas-src-jul18a/admin/define-system.sh 2018-06-12 15:22:32.000000000 +0200 ++++ gildas-src-jul18a.aarch64/admin/define-system.sh 2018-07-21 13:05:52.000000000 +0200 +@@ -174,7 +174,7 @@ + DEFAULT_CONFIG= # Default config is empty + case `uname` in + Linux) +- if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then ++ if [ `uname -m | grep -c "64"` -ne 0 ]; then + GAG_MACHINE=x86_64 + else + GAG_MACHINE=pc diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index f7c0e17e0ade..e9b39a0103e5 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out |