MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45303 from markuskowa/molden-up

Browse source 
molden: 5.7 -> 5.8.2
This commit is contained in:
Jörg Thalheim 2018-08-19 13:32:28 +01:00 committed by GitHub
commit 4609e3abf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/science/chemistry/molden/default.nix
View file

@ -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' "" \

29
pkgs/applications/science/chemistry/molden/dont_register_file_types.patch Normal file
View file

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