MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

expat: split dev output

Browse source
This commit is contained in:
Vladimír Čunát 2015-10-15 13:57:38 +02:00
parent ad02a45af0
commit dd915f82e7
11 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/roxterm/default.nix
View file

@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
buildPhase = ''
# Fix up the LD_LIBRARY_PATH so that expat is on it
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat}/lib"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib"
python mscript.py configure --prefix="$out"
python mscript.py build

2
pkgs/applications/misc/tilda/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build
# The config locking scheme relies on the binary being called "tilda",
# (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice:

2
pkgs/applications/networking/instant-messengers/sflphone/default.nix
View file

@ -40,7 +40,7 @@ rec {
cd ..
'';
configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " +
"--with-expat-lib=-lexpat --with-opus ";
buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate

2
pkgs/development/interpreters/lua-5/expat.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
makeFlagsArray=(
LUA_LDIR="$out/share/lua/${lua5.luaversion}"
LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}"
EXPAT_INC="-I${expat}/include");
EXPAT_INC="-I${expat.dev}/include");
'';
meta = {

4
pkgs/development/libraries/boost/generic.nix
View file

@ -64,8 +64,8 @@ let
] ++ optional (variant == "release") "debug-symbols=off";
nativeB2Flags = [
"-sEXPAT_INCLUDE=${expat}/include"
"-sEXPAT_LIBPATH=${expat}/lib"
"-sEXPAT_INCLUDE=${expat.dev}/include"
"-sEXPAT_LIBPATH=${expat.out}/lib"
] ++ optional (toolset != null) "toolset=${toolset}"
++ optional (mpi != null) "--user-config=user-config.jam";
nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);

4
pkgs/development/libraries/expat/default.nix
View file

@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
patches = [ ./CVE-2015-1283.patch ];
outputs = [ "dev" "out" ]; # TODO: fix referrers
outputBin = "dev";
outputMan = "dev"; # tiny page for a dev tool
meta = with stdenv.lib; {
homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C";

2
pkgs/development/libraries/gettext/expat.nix
View file

@ -5,6 +5,6 @@ runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } ''
cp -rf ${gettext}/* $out/
chmod a+w $out/bin
for p in $out/bin/*; do
wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib
wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat.out}/lib
done
''

4
pkgs/development/ocaml-modules/expat/default.nix
View file

@ -28,8 +28,8 @@ stdenv.mkDerivation {
postPatch = ''
substituteInPlace "unittest.ml" \
--replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}"
substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat}/lib" \
substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat}/include" \
substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \
substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \
'';
configurePhase = "true"; # Skip configure

9
pkgs/tools/networking/unbound/default.nix
View file

@ -24,11 +24,10 @@ stdenv.mkDerivation rec {
installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
# get rid of runtime dependencies on $dev outputs
postInstall = ''
substituteInPlace "$lib/lib/libunbound.la" \
--replace '-L${openssl.dev}/lib' "" \
--replace '-L${libevent.dev}/lib' ""
'';
postInstall = ''substituteInPlace "$lib/lib/libunbound.la" ''
+ stdenv.lib.concatMapStrings
(pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ")
[ openssl expat libevent ];
meta = with stdenv.lib; {
description = "Validating, recursive, and caching DNS resolver";

2
pkgs/top-level/lua-packages.nix
View file

@ -99,7 +99,7 @@ let
makeFlagsArray=(
LUA_LDIR="$out/share/lua/${lua.luaversion}"
LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}"
EXPAT_INC="-I${expat}/include");
EXPAT_INC="-I${expat.dev}/include");
'';
meta = {

2
pkgs/top-level/perl-packages.nix
View file

@ -12451,7 +12451,7 @@ let self = _self // overrides; _self = with self; {
patchPhase = if stdenv.isCygwin then ''
sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
'' else null;
makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include";
makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include";
};
XMLXPath = buildPerlPackage {