diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-13 23:01:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-13 23:01:46 +0100 |
| commit | 0c524c63c6c1db5610c6b8d7901e13926538feaf (patch) | |
| tree | 734f1c28899ffca4c60773c31435ae9584665253 /pkgs/development/interpreters/guile | |
| parent | 1daf2e26d221712dfbe72f9f6d2f73ef230cc43c (diff) | |
guile: refactor expression
No rebuild on non-Solaris.
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 41ce9c659aa2..0283f7774857 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -46,7 +46,21 @@ # don't have "libgcc_s.so.1" on darwin LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - configureFlags = [ "--with-libreadline-prefix" ]; + configureFlags = [ "--with-libreadline-prefix" ] + ++ stdenv.lib.optionals stdenv.isSunOS [ + # Make sure the right <gmp.h> is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> + # for details. + "--with-libgmp-prefix=${gmp.dev}" + + # Same for these (?). + "--with-libreadline-prefix=${readline.dev}" + "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" + ]; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -92,27 +106,6 @@ processing. ''; }; -} - -// - -(stdenv.lib.optionalAttrs stdenv.isSunOS { - # TODO: Move me above. - configureFlags = - [ - # Make sure the right <gmp.h> is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> - # for details. - "--with-libgmp-prefix=${gmp.dev}" - - # Same for these (?). - "--with-libreadline-prefix=${readline.dev}" - "--with-libunistring-prefix=${libunistring}" - - # See below. - "--without-threads" - ]; }) // @@ -121,4 +114,4 @@ # Work around <http://bugs.gnu.org/14201>. SHELL = "/bin/sh"; CONFIG_SHELL = "/bin/sh"; -})) +}) |