diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:20:09 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:20:09 +0100 |
| commit | ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b (patch) | |
| tree | 8070852a5ee331104a06de5395d30223185f936a /pkgs/development/interpreters/guile | |
| parent | 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (diff) | |
| download | nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.gz nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.bz2 nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.lz nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.xz nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.zst nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.zip | |
Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase.
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/1.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index bf1efbbb1a95..f44f71020b4c 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { # GCC 4.6 raises a number of set-but-unused warnings. configureFlags = [ "--disable-error-on-warning" ]; - buildNativeInputs = [ makeWrapper gawk ]; + nativeBuildInputs = [ makeWrapper gawk ]; propagatedBuildInputs = [ readline gmp libtool ]; - selfBuildNativeInput = true; + selfNativeBuildInput = true; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 421c35997e39..d09e995e95c0 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,7 +14,7 @@ sha256 = "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg"; }; - buildNativeInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] @@ -25,7 +25,7 @@ ++ [ libtool libunistring ]; # A native Guile 2.0 is needed to cross-build Guile. - selfBuildNativeInput = true; + selfNativeBuildInput = true; enableParallelBuilding = true; |