diff options
| author | Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr> | 2018-09-04 15:55:46 +0200 |
|---|---|---|
| committer | Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr> | 2018-09-04 16:05:44 +0200 |
| commit | 3bc898035d7e4402ca9257b8e348545868433520 (patch) | |
| tree | 9e35caf5e7cb033224da40157c48d06857dc3b58 /pkgs/applications/science | |
| parent | 205f3e941a6fff6b8bb12fc20dfdd76ba3d64455 (diff) | |
| download | nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.tar nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.tar.gz nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.tar.bz2 nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.tar.lz nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.tar.xz nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.tar.zst nixpkgs-3bc898035d7e4402ca9257b8e348545868433520.zip | |
gildas: fix makefile rule
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch | 13 |
2 files changed, 14 insertions, 1 deletions
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 |