diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 18:03:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:54 -0400 |
| commit | f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 (patch) | |
| tree | e853e7da55b09acd1d622991491c1a696f9857ef /pkgs/development/interpreters | |
| parent | 531e4b80c97002a542beb8fe356177ebd66cdd8e (diff) | |
| download | nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.gz nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.bz2 nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.lz nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.xz nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.zst nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.zip | |
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pixie/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/1.8.5.nix | 3 |
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 b41fa8a77c4d..af728b942ebb 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 9e9a99e52879..b196af8e3ae4 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 418ee90533f1..9a14beb856b6 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"; |