diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:33 +0200 |
commit | 153a19df05133657dd3025812a544f8961c41b12 (patch) | |
tree | 9974b86334e11ffa884610dd0999a62b78e0ee96 /pkgs/applications/science/chemistry/molden/dont_register_file_types.patch | |
parent | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (diff) | |
parent | 6755ab8b3442d6149e4bae5e142d516a506f6e45 (diff) | |
download | nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.gz nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.bz2 nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.lz nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.xz nixpkgs-153a19df05133657dd3025812a544f8961c41b12.tar.zst nixpkgs-153a19df05133657dd3025812a544f8961c41b12.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
Diffstat (limited to 'pkgs/applications/science/chemistry/molden/dont_register_file_types.patch')
-rw-r--r-- | pkgs/applications/science/chemistry/molden/dont_register_file_types.patch | 29 |
1 files changed, 29 insertions, 0 deletions
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 00000000000..75ce593ed29 --- /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 |