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/erlang | |
parent | 531e4b80c97002a542beb8fe356177ebd66cdd8e (diff) | |
download | nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.gz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.bz2 nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.lz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.xz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.zst nixpkgs-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/erlang')
-rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index b41fa8a77c4..af728b942eb 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 |