Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1daf2e26d221
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 218713aa3d05
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 13, 2017

  1. guile: refactor expression 

    No rebuild on non-Solaris.
    @vcunat
    vcunat committed Feb 13, 2017
    Copy the full SHA
    0c524c6 View commit details

  2. guile*: split outputs to fix #22757 

    The main aim is to decouple propagatedBuildInputs from $out.
    @vcunat
    vcunat committed Feb 13, 2017
    Copy the full SHA
    218713a View commit details
Showing with 22 additions and 23 deletions.
  1. +3 −0 pkgs/development/interpreters/guile/1.8.nix
  2. +19 −23 pkgs/development/interpreters/guile/default.nix
3 changes: 3 additions & 0 deletions pkgs/development/interpreters/guile/1.8.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {

patches = [ ./cpp-4.5.patch ];

outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise

# GCC 4.6 raises a number of set-but-unused warnings.
configureFlags = [ "--disable-error-on-warning" ];

42 changes: 19 additions & 23 deletions pkgs/development/interpreters/guile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@
sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
};

outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise

nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool libunistring libffi ];
propagatedBuildInputs = [ gmp boehmgc ]
@@ -46,7 +49,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 +109,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 +117,4 @@
# Work around <http://bugs.gnu.org/14201>.
SHELL = "/bin/sh";
CONFIG_SHELL = "/bin/sh";
}))
})