boost: Fix incompatible applications
This commit is contained in:
parent
8f8712b1e1
commit
a9c472d16e
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost}
|
qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-ldap-dir=${openldap}"
|
"--with-ldap-dir=${openldap}"
|
||||||
"--with-libsasl2-dir=${cyrus_sasl}"
|
"--with-libsasl2-dir=${cyrus_sasl}"
|
||||||
|
"--with-boost-libdir=${boost.lib}/lib"
|
||||||
"--disable-gconf"
|
"--disable-gconf"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,8 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ boost mdds pkgconfig ];
|
buildInputs = [ boost mdds pkgconfig ];
|
||||||
|
|
||||||
|
configureFlags = [ "--with-boost=${boost.dev}" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
|
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
|
||||||
|
@ -60,6 +62,8 @@ let
|
||||||
(import ./libreoffice-srcs.nix));
|
(import ./libreoffice-srcs.nix));
|
||||||
|
|
||||||
buildInputs = [ boost mdds pkgconfig zlib libixion ];
|
buildInputs = [ boost mdds pkgconfig zlib libixion ];
|
||||||
|
|
||||||
|
configureFlags = [ "--with-boost=${boost.dev}" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchSrc = {name, sha256}: fetchurl {
|
fetchSrc = {name, sha256}: fetchurl {
|
||||||
|
@ -180,6 +184,8 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
"--with-boost=${boost.dev}"
|
||||||
|
"--with-boost-libdir=${boost.lib}/lib"
|
||||||
"--with-vendor=NixOS"
|
"--with-vendor=NixOS"
|
||||||
|
|
||||||
# Without these, configure does not finish
|
# Without these, configure does not finish
|
||||||
|
|
|
@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
|
||||||
boost glm
|
boost glm
|
||||||
];
|
];
|
||||||
|
|
||||||
|
configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
|
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -30,12 +30,11 @@ stdenv.mkDerivation rec {
|
||||||
patch -p1 < ${patch_CVE}
|
patch -p1 < ${patch_CVE}
|
||||||
|
|
||||||
# Add all libs to `macros/libslist', a list of library search paths.
|
# Add all libs to `macros/libslist', a list of library search paths.
|
||||||
for lib in ${lib.concatStringsSep " "
|
libs=$(echo "$NIX_LDFLAGS" | tr ' ' '\n' | sed -n 's/.*-L\(.*\).*/\1/p')
|
||||||
(map (lib: "\"${lib}\"/lib")
|
for lib in $libs; do
|
||||||
(buildInputs ++ [stdenv.glibc]))}
|
|
||||||
do
|
|
||||||
echo -n "$lib " >> macros/libslist
|
echo -n "$lib " >> macros/libslist
|
||||||
done
|
done
|
||||||
|
echo -n "${stdenv.glibc}/lib" >> macros/libslist
|
||||||
|
|
||||||
# Make sure to honor $TMPDIR, for chroot builds.
|
# Make sure to honor $TMPDIR, for chroot builds.
|
||||||
for file in configure gui/Makefile.in Makefile.in
|
for file in configure gui/Makefile.in Makefile.in
|
||||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ boost gtkmm lv2 pkgconfig python ];
|
buildInputs = [ boost gtkmm lv2 pkgconfig python ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
python waf configure --prefix=$out --boost-includes=${boost}/include
|
python waf configure --prefix=$out --boost-includes="${boost.dev}/include"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = "python waf";
|
buildPhase = "python waf";
|
||||||
|
|
|
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
|
sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
configureFlags = [ "--with-boost=${boost.dev}" ];
|
||||||
|
|
||||||
buildInputs = [ expat zlib boost ];
|
buildInputs = [ expat zlib boost ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -14,9 +14,9 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
buildInputs = [ boost ];
|
buildInputs = [ boost ];
|
||||||
|
|
||||||
enableParallelBuilding = false;
|
configureFlags = [ "--with-boost=${boost.lib}" ];
|
||||||
|
|
||||||
doCheck = true;
|
enableParallelBuilding = false;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Source code renderer with syntax highlighting";
|
description = "Source code renderer with syntax highlighting";
|
||||||
|
|
|
@ -1081,7 +1081,7 @@ let
|
||||||
|
|
||||||
evtest = callPackage ../applications/misc/evtest { };
|
evtest = callPackage ../applications/misc/evtest { };
|
||||||
|
|
||||||
exempi = callPackage ../development/libraries/exempi { };
|
exempi = callPackage ../development/libraries/exempi { boost = boost155; };
|
||||||
|
|
||||||
execline = callPackage ../tools/misc/execline { };
|
execline = callPackage ../tools/misc/execline { };
|
||||||
|
|
||||||
|
@ -1280,7 +1280,7 @@ let
|
||||||
|
|
||||||
googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
|
googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
|
||||||
|
|
||||||
gource = callPackage ../applications/version-management/gource {};
|
gource = callPackage ../applications/version-management/gource { };
|
||||||
|
|
||||||
gparted = callPackage ../tools/misc/gparted { };
|
gparted = callPackage ../tools/misc/gparted { };
|
||||||
|
|
||||||
|
@ -1639,7 +1639,9 @@ let
|
||||||
|
|
||||||
memtest86plus = callPackage ../tools/misc/memtest86+ { };
|
memtest86plus = callPackage ../tools/misc/memtest86+ { };
|
||||||
|
|
||||||
meo = callPackage ../tools/security/meo { };
|
meo = callPackage ../tools/security/meo {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
mc = callPackage ../tools/misc/mc { };
|
mc = callPackage ../tools/misc/mc { };
|
||||||
|
|
||||||
|
@ -7580,9 +7582,13 @@ let
|
||||||
|
|
||||||
restund = callPackage ../servers/restund {};
|
restund = callPackage ../servers/restund {};
|
||||||
|
|
||||||
rethinkdb = callPackage ../servers/nosql/rethinkdb { };
|
rethinkdb = callPackage ../servers/nosql/rethinkdb {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
rippled = callPackage ../servers/rippled { };
|
rippled = callPackage ../servers/rippled {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
s6 = callPackage ../servers/s6 { };
|
s6 = callPackage ../servers/s6 { };
|
||||||
|
|
||||||
|
@ -9660,7 +9666,9 @@ let
|
||||||
fltk = fltk13;
|
fltk = fltk13;
|
||||||
};
|
};
|
||||||
|
|
||||||
hugin = callPackage ../applications/graphics/hugin { };
|
hugin = callPackage ../applications/graphics/hugin {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
hydrogen = callPackage ../applications/audio/hydrogen { };
|
hydrogen = callPackage ../applications/audio/hydrogen { };
|
||||||
|
|
||||||
|
@ -9761,6 +9769,7 @@ let
|
||||||
|
|
||||||
k3d = callPackage ../applications/graphics/k3d {
|
k3d = callPackage ../applications/graphics/k3d {
|
||||||
inherit (pkgs.gnome2) gtkglext;
|
inherit (pkgs.gnome2) gtkglext;
|
||||||
|
boost = boost155;
|
||||||
};
|
};
|
||||||
|
|
||||||
keepnote = callPackage ../applications/office/keepnote {
|
keepnote = callPackage ../applications/office/keepnote {
|
||||||
|
@ -9820,6 +9829,7 @@ let
|
||||||
inherit (gnome) GConf ORBit2 gnome_vfs;
|
inherit (gnome) GConf ORBit2 gnome_vfs;
|
||||||
zip = zip.override { enableNLS = false; };
|
zip = zip.override { enableNLS = false; };
|
||||||
jdk = openjdk;
|
jdk = openjdk;
|
||||||
|
boost = boost155;
|
||||||
fontsConf = makeFontsConf {
|
fontsConf = makeFontsConf {
|
||||||
fontDirectories = [
|
fontDirectories = [
|
||||||
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
|
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
|
||||||
|
@ -11211,7 +11221,9 @@ let
|
||||||
|
|
||||||
glestae = callPackage ../games/glestae {};
|
glestae = callPackage ../games/glestae {};
|
||||||
|
|
||||||
globulation2 = callPackage ../games/globulation {};
|
globulation2 = callPackage ../games/globulation {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
gltron = callPackage ../games/gltron { };
|
gltron = callPackage ../games/gltron { };
|
||||||
|
|
||||||
|
@ -11231,7 +11243,9 @@ let
|
||||||
|
|
||||||
icbm3d = callPackage ../games/icbm3d { };
|
icbm3d = callPackage ../games/icbm3d { };
|
||||||
|
|
||||||
ingen = callPackage ../applications/audio/ingen { };
|
ingen = callPackage ../applications/audio/ingen {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
instead = callPackage ../games/instead {
|
instead = callPackage ../games/instead {
|
||||||
lua = lua5;
|
lua = lua5;
|
||||||
|
@ -11336,7 +11350,9 @@ let
|
||||||
# You still can override by passing more arguments.
|
# You still can override by passing more arguments.
|
||||||
spaceOrbit = callPackage ../games/orbit { };
|
spaceOrbit = callPackage ../games/orbit { };
|
||||||
|
|
||||||
spring = callPackage ../games/spring { };
|
spring = callPackage ../games/spring {
|
||||||
|
boost = boost155;
|
||||||
|
};
|
||||||
|
|
||||||
springLobby = callPackage ../games/spring/springlobby.nix { };
|
springLobby = callPackage ../games/spring/springlobby.nix { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue