JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gildas: fix makefile rule

Browse Source
This commit is contained in:
Sebastien Maret 2018-09-04 15:55:46 +02:00
parent 205f3e941a
commit 3bc898035d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/astronomy/gildas/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; 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='' configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out

13
pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch Normal file
View File

@ -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