mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 11:02:05 +00:00
treewide: Fix dev references to libxml2
This commit is contained in:
parent
47784e55e1
commit
048a30e4e4
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-libxml2=${libxml2}"
|
||||
"--with-libxml2=${libxml2.dev}"
|
||||
"--with-libxslt=${libxslt.dev}"
|
||||
];
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
|
|||
mkdir -p vendor/cache
|
||||
${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)}
|
||||
|
||||
bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}"
|
||||
bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2.dev}"
|
||||
|
||||
bundle install --verbose --local --deployment
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--with-libtool"
|
||||
"--with-libxml2=${libxml2}"
|
||||
"--with-libxml2=${libxml2.dev}"
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--without-atf"
|
||||
"--without-dlopen"
|
||||
|
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${libxml2}/include/libxml2"
|
||||
"-I${libxml2.dev}/include/libxml2"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-zlib=${zlib.dev}"
|
||||
"--with-libbz2-prefix=${bzip2.dev}"
|
||||
"--with-iconv-dir=${libiconv}"
|
||||
"--with-xml=${libxml2}"
|
||||
"--with-xml=${libxml2.dev}"
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--with-libncurses-prefix=${ncurses.dev}"
|
||||
"--with-libcurl=${curl.dev}"
|
||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-pcre=${pcre.dev}"
|
||||
"--with-apr=${apr.dev}"
|
||||
"--with-apu=${aprutil.dev}/bin/apu-1-config"
|
||||
"--with-libxml=${libxml2}"
|
||||
"--with-libxml=${libxml2.dev}"
|
||||
];
|
||||
|
||||
outputs = ["out" "nginx"];
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
preConfigure =
|
||||
''
|
||||
export LIBXSLT_PREFIX=${libxslt.dev}
|
||||
export LIBXML_PREFIX=${libxml2}
|
||||
export LIBXML_PREFIX=${libxml2.dev}
|
||||
export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt)
|
||||
export LIBXML_LIBS=$(pkg-config --libs libxml-2.0)
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue