diff options
| author | Adrien Devresse <adrien.devresse@epfl.ch> | 2016-08-23 13:30:40 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-01 12:03:10 +0200 |
| commit | ae2800378fe856edd5eed2a04407234779e81006 (patch) | |
| tree | 525ccf260c7b81bff43c4fb8238a6ceaf15386e6 /pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch | |
| parent | e0da6b16f680e727abeab24daead1031fcb85893 (diff) | |
| download | nixlib-ae2800378fe856edd5eed2a04407234779e81006.tar nixlib-ae2800378fe856edd5eed2a04407234779e81006.tar.gz nixlib-ae2800378fe856edd5eed2a04407234779e81006.tar.bz2 nixlib-ae2800378fe856edd5eed2a04407234779e81006.tar.lz nixlib-ae2800378fe856edd5eed2a04407234779e81006.tar.xz nixlib-ae2800378fe856edd5eed2a04407234779e81006.tar.zst nixlib-ae2800378fe856edd5eed2a04407234779e81006.zip | |
neuron: fix issue #17914 -> Add python bindings to neuron derivation and minor fixes
- Add support for python bindings - make neuron respect standard pythonpath prefix - force exec_prefix == prefix to respect standard nix file hierarchy - normalize indentation - propagate dependencies necessary for nrniv_makefile usage - Add support for darwin
Diffstat (limited to 'pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch')
| -rw-r--r-- | pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch new file mode 100644 index 000000000000..923bffb1c338 --- /dev/null +++ b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch @@ -0,0 +1,21 @@ +--- nrn-7.4/src/mac/Makefile.am 2015-11-12 21:42:45.000000000 +0100 ++++ nrn-7.4.new/src/mac/Makefile.am 2016-08-24 17:43:39.000000000 +0200 +@@ -15,18 +15,8 @@ + host_cpu = @host_cpu@ + + if MAC_DARWIN +-carbon = @enable_carbon@ + bin_SCRIPTS = $(launch_scripts) + install: install-am +-if UniversalMacBinary +- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon +- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon +- lipo aouti386 aoutppc -create -output a.out +-else +- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon +- +-endif +- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)" + for i in $(S) ; do \ + sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \ + mv temp $(DESTDIR)$(bindir)/$$i; \ |