about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/erlang/generic-builder.nix5
-rw-r--r--pkgs/development/interpreters/pixie/default.nix5
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.5.nix3
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index b41fa8a77c4d9..af728b942ebb8 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -47,10 +47,9 @@ in stdenv.mkDerivation ({
 
   inherit src version;
 
-  nativeBuildInputs = [ autoreconfHook makeWrapper perl ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ]
+  buildInputs = [ ncurses openssl ]
     ++ optionals wxSupport wxPackages2
     ++ optionals odbcSupport odbcPackages
     ++ optionals javacSupport javacPackages
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 9e9a99e52879a..b196af8e3ae4c 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -32,9 +32,8 @@ let
   build = {flags, target}: stdenv.mkDerivation rec {
     name = "pixie-${version}";
     version = "0-r${commit-count}-${variant}";
-    nativeBuildInputs = libs;
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ makeWrapper ];
+    nativeBuildInputs = [ makeWrapper pkgconfig ];
+    buildInputs = libs;
     PYTHON = if buildWithPypy
       then "${pypy}/pypy-c/.pypy-c-wrapped"
       else "${python2.interpreter}";
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 418ee90533f17..9a14beb856b67 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213;
   buildInputs = [ perl python2 zip ];
-  nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else [];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";