diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
| commit | 10a12194e301f2ad3ff6899e022afa96af0610c8 (patch) | |
| tree | 9c33b65e84504d37635d942a91bc5aa0b075058d /pkgs/applications/science | |
| parent | 5489e49ebb5cb9b973133fcd70d3196fb12acc0b (diff) | |
| parent | 981b504ecddd981488578494304d141849697dba (diff) | |
| download | nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.gz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.bz2 nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.lz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.xz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.zst nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.zip | |
Merge #53490: fix treewide linking errors after #51770
Issue #53001. This might not be all of them, but let's not wait.
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/chemistry/avogadro/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/golly/beta.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 78cda9d115ce..a569b82ff59d 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h"; + patches = [ + (fetchurl { + url = https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch; + sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k"; + }) + ]; + meta = { description = "Molecule editor and visualizer"; maintainers = [ ]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 83b9c5a04a19..ebc476d3c6d0 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags=[ "AM_LDFLAGS=" ]; - NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl -ldl -lGL"; preConfigure='' export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE |