From 3bc898035d7e4402ca9257b8e348545868433520 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Tue, 4 Sep 2018 15:55:46 +0200 Subject: [PATCH 1/2] gildas: fix makefile rule --- .../science/astronomy/gildas/default.nix | 2 +- .../astronomy/gildas/gag-font-bin-rule.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index ee19077065e..8b01ef0c771 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 ./aarch64.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch new file mode 100644 index 00000000000..61ddc37c7fd --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch @@ -0,0 +1,13 @@ +diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile +--- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200 ++++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200 +@@ -29,7 +29,8 @@ + + SEDEXE=sed -e 's?source tree?executable tree?g' + +-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey ++$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \ ++ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl + ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw) + $(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin + else From b76cf0b54c6d6108466a7ca67e4a952e6017bca7 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Wed, 5 Sep 2018 12:17:05 +0200 Subject: [PATCH 2/2] gildas: ignore clang warnings for unused command line arguments See #46044 --- pkgs/applications/science/astronomy/gildas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 8b01ef0c771..d74eee4190d 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env}