diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-19 13:32:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 13:32:28 +0100 |
| commit | 4609e3abf2a945f7206eec329b4bd486c68c1fdc (patch) | |
| tree | bb4423c9959fff14c929b20060da46ca566d170e /pkgs/applications/science/chemistry | |
| parent | 1a08bcf198708abd080e36ce58c1fafedc88eb7c (diff) | |
| parent | 04d283ecda196e8b208f983480f6d981554ae535 (diff) | |
| download | nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.tar nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.tar.gz nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.tar.bz2 nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.tar.lz nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.tar.xz nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.tar.zst nixlib-4609e3abf2a945f7206eec329b4bd486c68c1fdc.zip | |
Merge pull request #45303 from markuskowa/molden-up
molden: 5.7 -> 5.8.2
Diffstat (limited to 'pkgs/applications/science/chemistry')
| -rw-r--r-- | pkgs/applications/science/chemistry/molden/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/chemistry/molden/dont_register_file_types.patch | 29 |
2 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 1472b4b2af9e..76a19d410ef8 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.7"; + version = "5.8.2"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s"; + sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4"; }; nativeBuildInputs = [ which ]; buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ]; + patches = [ ./dont_register_file_types.patch ]; + postPatch = '' substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ --replace '-I/usr/X11R6/include' "" \ diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch new file mode 100644 index 000000000000..75ce593ed29a --- /dev/null +++ b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch @@ -0,0 +1,29 @@ +diff --git a/makefile b/makefile +index 58a9e74..64615b6 100644 +--- a/makefile ++++ b/makefile +@@ -32,8 +32,6 @@ os := + ifeq ($(uname), Linux) + os := $(shell head -n 1 /etc/issue | cut -d" " -f1) + ifeq ($(os), Ubuntu) +- EXTEN = exten +- EXTENZ = exten2 + LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm + endif + ifeq ($(os), Debian) +@@ -278,7 +276,7 @@ LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm + # + #LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm + +-all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf $(EXTEN) ++all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf + xwin.o: xwin.c rots.h + xwingl.o: xwin.c rots.h + +@@ -344,5 +342,5 @@ exten: + exten2: + ./register_extension.sh /usr/local/bin + +-install: $(EXTENZ) ++install: + sudo install -t /usr/local/bin -m 755 molden gmolden ambfor/ambfor ambfor/ambmd surf/surf |