colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source 
Includes a security update of libxml2.
This commit is contained in:
Vladimír Čunát 2016-05-27 15:37:04 +02:00
commit e4832c7541
234 changed files with 444 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/composable-derivation.nix
View File

@ -50,7 +50,7 @@ let inherit (lib) nv nvs; in
# nice features:
# declaring "optional featuers" is modular. For instance:
# flags.curl = {
# configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
# configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"];
# buildInputs = [curl openssl];
# };
# flags.other = { .. }

2
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
View File

@ -43,7 +43,7 @@ let
# Paths to external programs.
$wgDiff3 = "${pkgs.diffutils}/bin/diff3";
$wgDiff = "${pkgs.diffutils}/bin/diff";
$wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert";
$wgImageMagickConvertCommand = "${pkgs.imagemagick.out}/bin/convert";
#$wgDebugLogFile = "/tmp/mediawiki_debug_log.txt";

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -44,7 +44,7 @@ let
${cfg.extraGSettingsOverrides}
EOF
${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
'';
};

4
nixos/modules/services/x11/hardware/synaptics.nix
View File

@ -169,10 +169,10 @@ in {
config = mkIf cfg.enable {
services.xserver.modules = [ pkg ];
services.xserver.modules = [ pkg.out ];
environment.etc."${etcFile}".source =
"${pkg}/share/X11/xorg.conf.d/50-synaptics.conf";
"${pkg.out}/share/X11/xorg.conf.d/50-synaptics.conf";
environment.systemPackages = [ pkg ];

2
nixos/modules/system/boot/luksroot.nix
View File

@ -438,7 +438,7 @@ in
copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl
cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
strip -s pbkdf2-sha512
copy_bin_and_libs pbkdf2-sha512

2
pkgs/applications/display-managers/slim/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11";
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11";
enableParallelBuilding = true;

2
pkgs/applications/editors/emacs-25/default.nix
View File

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
"--with-gif=no" "--with-tiff=no" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX)
"-I${cairo}/include/cairo";
"-I${cairo.dev}/include/cairo";
preBuild = ''
find . -name '*.elc' -delete

6
pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
View File

@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -i "w3m.el" \
-e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ;
s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g'
s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g'
sed -i "w3m-image.el" \
-e 's|(w3m-which-command "convert")|"${imagemagick}/bin/convert"|g ;
s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g'
-e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ;
s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g'
'';
configureFlags = [

2
pkgs/applications/editors/texmaker/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 poppler_qt4 zlib ];
nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = ''
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"

16
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -43,7 +43,8 @@ stdenv.mkDerivation rec {
patches = [ ./imagetragick.patch ] ++ cfg.patches;
outputs = [ "out" "doc" ];
outputs = [ "dev" "out" "doc" ]; # bin/ isn't really big
outputMan = "out"; # it's tiny
enableParallelBuilding = true;
@ -76,18 +77,23 @@ stdenv.mkDerivation rec {
;
postInstall = ''
(cd "$out/include" && ln -s ImageMagick* ImageMagick)
(cd "$dev/include" && ln -s ImageMagick* ImageMagick)
moveToOutput "bin/*-config" "$dev"
moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
for file in "$dev"/bin/*-config; do
substituteInPlace "$file" --replace pkg-config \
"PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"
done
'' + lib.optionalString (ghostscript != null) ''
for la in $out/lib/*.la; do
sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la
sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
done
'';
meta = with stdenv.lib; {
homepage = http://www.imagemagick.org/;
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ [ "x86_64-darwin" ];
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ the-kenny wkennington ];
};
}

2
pkgs/applications/graphics/digikam/default.nix
View File

@ -71,7 +71,7 @@ let
# Help digiKam find libusb, otherwise gphoto2 support is disabled
cmakeFlags = [
"-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
"-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"
"-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
"-DENABLE_BALOOSUPPORT=ON"
"-DENABLE_KDEPIMLIBSSUPPORT=ON"
"-DENABLE_LCMS2=ON" ]

4
pkgs/applications/graphics/qtpfsgui/default.nix
View File

@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
qmakeFlags = [
"EXIV2PATH=${exiv2}/include/exiv2"
"OPENEXRDIR=${openexr}/include/OpenEXR"
"FFTW3DIR=${fftwSinglePrec}/include"
"LIBTIFFDIR=${libtiff}/include"
"FFTW3DIR=${fftwSinglePrec.dev}/include"
"LIBTIFFDIR=${libtiff.dev}/include"
];
meta = {

2
pkgs/applications/graphics/shotwell/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
configureFlags = [ "--disable-gsettings-convert-install" ];

2
pkgs/applications/misc/apvlv/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler"
'';
buildInputs = [

6
pkgs/applications/misc/calibre/default.nix
View File

@ -45,10 +45,10 @@ stdenv.mkDerivation rec {
installPhase = ''
export HOME=$TMPDIR/fakehome
export POPPLER_INC_DIR=${poppler_utils}/include/poppler
export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler
export POPPLER_LIB_DIR=${poppler_utils.out}/lib
export MAGICK_INC=${imagemagick}/include/ImageMagick
export MAGICK_LIB=${imagemagick}/lib
export MAGICK_INC=${imagemagick.dev}/include/ImageMagick
export MAGICK_LIB=${imagemagick.out}/lib
export FC_INC_DIR=${fontconfig.dev}/include/fontconfig
export FC_LIB_DIR=${fontconfig.lib}/lib
export PODOFO_INC_DIR=${podofo}/include/podofo

2
pkgs/applications/misc/diffpdf/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake4Hook ];
preConfigure = ''
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4}
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev}
lrelease diffpdf.pro
'';

2
pkgs/applications/misc/fetchmail/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ openssl ];
configureFlags = "--with-ssl=${openssl}";
configureFlags = "--with-ssl=${openssl.dev}";
meta = {
homepage = "http://www.fetchmail.info/";

2
pkgs/applications/misc/garmin-plugin/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sourceRoot = "GarminPlugin-0.3.26/src";
buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ];
configureFlags = [
"--with-libgcrypt-prefix=${libgcrypt}"
"--with-libgcrypt-prefix=${libgcrypt.dev}"
"--with-garmintools-incdir=${garmintools}/include"
"--with-garmintools-libdir=${garmintools}/lib"
];

2
pkgs/applications/misc/gkrellm/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
echo "patching makefiles..."
for i in Makefile src/Makefile server/Makefile
do
sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g"
sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
done '';
buildPhase = ''

2
pkgs/applications/misc/mrxvt/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
];
preConfigure = ''
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2";
'';
src = fetchurl {

2
pkgs/applications/misc/pinfo/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline}" ];
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
meta = with stdenv.lib; {
description = "A viewer for info files";

2
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
mkdir -p $terminfo/share/terminfo
configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}";
export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"
NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
''
# make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically

2
pkgs/applications/misc/xautoclick/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals gtkSupport [ gtk ]
++ stdenv.lib.optionals qtSupport [ qt4 ];
patchPhase = ''
substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11}
substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev}
'';
preConfigure = stdenv.lib.optional qtSupport ''
mkdir .bin

2
pkgs/applications/misc/zathura/core/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib ];
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [
"PREFIX=$(out)"

2
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
--enable-finger --enable-html-highlight
--with-perl --enable-gopher --enable-cgi --enable-bittorrent
--with-spidermonkey=${spidermonkey}
--enable-nntp --with-openssl=${openssl}
--enable-nntp --with-openssl=${openssl.dev}
'' + stdenv.lib.optionalString enableGuile " --with-guile"
+ stdenv.lib.optionalString enablePython " --with-python";

2
pkgs/applications/networking/browsers/lynx/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
configureFlags = []
++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl}" ];
++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ];
buildInputs = [ ncurses gzip ];
nativeBuildInputs = [ ncurses ];

2
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
ln -s $out/libexec/w3m/w3mimgdisplay $out/bin
'';
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}"
+ optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb";
preConfigure = ''

10
pkgs/applications/networking/cluster/mesos/default.nix
View File

@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace configure.ac \
--replace /usr/include/libnl3 ${libnl}/include/libnl3
--replace /usr/include/libnl3 ${libnl.dev}/include/libnl3
substituteInPlace src/linux/perf.cpp \
--replace '"perf ' '"${perf}/bin/perf '
@ -94,17 +94,17 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--sbindir=\${out}/bin"
"--with-apr=${apr}"
"--with-svn=${subversion}"
"--with-apr=${apr.dev}"
"--with-svn=${subversion.dev}"
"--with-leveldb=${leveldb}"
"--with-glog=${glog}"
"--with-glog=${glog}"
"--enable-optimize"
"--disable-python-dependency-install"
"--enable-ssl"
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
"--enable-libevent"
"--with-libevent=${libevent}"
"--with-libevent=${libevent.dev}"
] ++ lib.optionals stdenv.isLinux [
"--with-network-isolator"
];

2
pkgs/applications/networking/instant-messengers/centerim/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl curl ncurses libjpeg ]
++ stdenv.lib.optional withGpg gpgme;
configureFlags = [ "--with-openssl=${openssl}" ];
configureFlags = [ "--with-openssl=${openssl.dev}" ];
meta = {
homepage = http://www.centerim.org/;

4
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--with-ldap-dir=${openldap}"
"--with-libsasl2-dir=${cyrus_sasl}"
"--with-ldap-dir=${openldap.dev}"
"--with-libsasl2-dir=${cyrus_sasl.dev}"
"--with-boost-libdir=${boost.out}/lib"
"--disable-gconf"
];

2
pkgs/applications/networking/instant-messengers/linphone/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-ldap"
"--with-ffmpeg=${ffmpeg}"
"--with-ffmpeg=${ffmpeg.dev}"
"--with-polarssl=${polarssl}"
"--enable-lime"
"--enable-external-ortp"

2
pkgs/applications/networking/instant-messengers/mcabber/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr";
configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr";
doCheck = true;

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
passthru = {
wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin";
wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin";
};
meta = with stdenv.lib; {

2
pkgs/applications/networking/instant-messengers/silc-client/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
dontDisableStatic = true;
configureFlags = "--with-ncurses=${ncurses}";
configureFlags = "--with-ncurses=${ncurses.dev}";
preConfigure = stdenv.lib.optionalString enablePlugin ''
configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"

12
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -46,14 +46,14 @@ in stdenv.mkDerivation rec {
"CONFIG+=release"
"DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE"
"DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
"INCLUDEPATH+=${gtk2}/include/gtk-2.0"
"INCLUDEPATH+=${glib}/include/glib-2.0"
"INCLUDEPATH+=${gtk2.dev}/include/gtk-2.0"
"INCLUDEPATH+=${glib.dev}/include/glib-2.0"
"INCLUDEPATH+=${glib.out}/lib/glib-2.0/include"
"INCLUDEPATH+=${cairo}/include/cairo"
"INCLUDEPATH+=${pango}/include/pango-1.0"
"INCLUDEPATH+=${cairo.dev}/include/cairo"
"INCLUDEPATH+=${pango.dev}/include/pango-1.0"
"INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include"
"INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0"
"INCLUDEPATH+=${atk}/include/atk-1.0"
"INCLUDEPATH+=${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0"
"INCLUDEPATH+=${atk.dev}/include/atk-1.0"
"INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1"
"INCLUDEPATH+=${libunity}/include/unity"
"INCLUDEPATH+=${dee}/include/dee-1.0"

2
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
./boost_regex.patch # modified not to use "-mt" suffix
];
configureFlags = "--with-extra-includes=${libjpeg}/include";
configureFlags = "--with-extra-includes=${libjpeg.dev}/include";
buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile

2
pkgs/applications/networking/irc/wraith/default.nix
View File

@ -16,7 +16,7 @@ mkDerivation rec {
substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl}
substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl}
'';
configureFlags = "--with-openssl=${openssl}";
configureFlags = "--with-openssl=${openssl.dev}";
installPhase = ''
mkdir -p $out/bin
cp -a wraith $out/bin/wraith

2
pkgs/applications/networking/mailreaders/alpine/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
inherit (s) url sha256;
};
configureFlags = [
"--with-ssl-include-dir=${openssl}/include/openssl"
"--with-ssl-include-dir=${openssl.dev}/include/openssl"
"--with-tcl-lib=${tcl.libPrefix}"
];
preConfigure = ''

2
pkgs/applications/networking/mailreaders/realpine/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
inherit (s) url sha256;
};
configureFlags = [
"--with-ssl-include-dir=${openssl}/include/openssl"
"--with-ssl-include-dir=${openssl.dev}/include/openssl"
"--with-tcl-lib=${tcl.libPrefix}"
];
preConfigure = ''

2
pkgs/applications/networking/newsreaders/slrn/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
-e "s|/bin/rm|rm|"
'';
configureFlags = "--with-slang=${slang} --with-ssl=${openssl}";
configureFlags = "--with-slang=${slang.dev} --with-ssl=${openssl.dev}";
buildInputs = [ slang ncurses openssl ];

2
pkgs/applications/networking/remote/rdesktop/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
buildInputs = [openssl libX11];
configureFlags = [
"--with-openssl=${openssl}"
"--with-openssl=${openssl.dev}"
"--disable-credssp"
"--disable-smartcard"
];

2
pkgs/applications/science/astronomy/celestia/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation {
CPPFLAGS = "-DNDEBUG";
CFLAGS = "-O2 -fsigned-char";
CXXFLAGS = "-O2 -fsigned-char";
GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include";
GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include";
GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0";
installPhase = ''make MKDIR_P="mkdir -p" install'';

4
pkgs/applications/science/math/pari/default.nix
View File

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
configureScript = "./Configure";
configureFlags =
"--with-gmp=${gmp} " +
"--with-readline=${readline}";
"--with-gmp=${gmp.dev} " +
"--with-readline=${readline.dev}";
meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations";

2
pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582";
};
NIX_CFLAGS_COMPILE = [ "-I${apr}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
patchPhase = ''
sed -i 's|/bin/cat|cat|' ./src/repository.cpp

2
pkgs/applications/version-management/kdesvn/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
prePatch = ''
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake
'';
buildInputs = [ apr aprutil subversion db kdelibs expat ];

2
pkgs/applications/version-management/redmine/default.nix
View File

@ -45,7 +45,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}" --with-xml2-dir="${libxml2}"
bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}"
bundle install --verbose --local --deployment

6
pkgs/applications/version-management/subversion/default.nix
View File

@ -43,14 +43,14 @@ let
configureFlags = ''
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"}
${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"}
${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
--disable-keychain
${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}
${if httpSupport then "--with-serf=${serf}" else "--without-serf"}
--with-zlib=${zlib}
--with-sqlite=${sqlite}
--with-zlib=${zlib.dev}
--with-sqlite=${sqlite.dev}
'';
preBuild = ''

2
pkgs/applications/video/xine-ui/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
configureFlags = "--with-readline=${readline}";
configureFlags = "--with-readline=${readline.dev}";
LIRC_CFLAGS="-I${lirc}/include";
LIRC_LIBS="-L ${lirc}/lib -llirc_client";

2
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -39,7 +39,7 @@ buildPythonApplication rec {
'';
postInstall = ''
${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
'';
# Failed tests

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -133,7 +133,7 @@ in stdenv.mkDerivation {
${optionalString (!pulseSupport) "--disable-pulse"} \
${optionalString (!enableHardening) "--disable-hardening"} \
--disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-i AutoConfig.kmk
sed -e 's@arch/x86/@@' \
-i Config.kmk

2
pkgs/applications/window-managers/i3/lock-fancy.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock
sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock
sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock
sed -i -e "s|convert |${imagemagick}/bin/convert |" lock
sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock
sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock
sed -i -e "s| awk | ${gawk}/bin/awk |" lock
sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock

4
pkgs/build-support/setup-hooks/separate-debug-info.sh
View File

@ -6,8 +6,10 @@ dontStrip=1
fixupOutputHooks+=(_separateDebugInfo)
_separateDebugInfo() {
[ -e "$prefix" ] || return 0
local dst="${debug:-$out}"
if [ "$prefix" = "$dst" ]; then return; fi
if [ "$prefix" = "$dst" ]; then return 0; fi
dst="$dst/lib/debug/.build-id"

2
pkgs/data/icons/tango-icon-theme/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-png-creation";
postInstall = '''${gtk}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
postInstall = '''${gtk.dev}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
meta = {
description = "A basic set of icons";

2
pkgs/desktops/enlightenment/elementary.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska";
};
buildInputs = [ pkgconfig efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/include/libdrm" ];
patches = [ ./elementary.patch ];
enableParallelBuilding = true;
meta = {

2
pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Cheese;

2
pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server

2
pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preFixup = ''
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
'';

2
pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart

2
pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas makeWrapper gnupg

2
pkgs/desktops/gnome-3/3.18/core/baobab/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

2
pkgs/desktops/gnome-3/3.18/core/evince/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
(if supportXPS then "--enable-xps" else "--disable-xps")
];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
preConfigure = with stdenv.lib;
optionalString doCheck ''

2
pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

2
pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# this should probably be setuphook for glib
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];

2
pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

2
pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

2
pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];

2
pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
buildInputs = with gnome3;
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager

2
pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];

4
pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
'';
preFixup = ''

2
pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# TODO: need libuhttpmock
configureFlags = "--disable-tests";
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
buildInputs = with gnome3;
[ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection

2
pkgs/desktops/gnome-3/3.18/core/mutter/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra";

2
pkgs/desktops/gnome-3/3.18/core/totem/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

2
pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
mkdir -p "$schemas_dir"
mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
${glib}/bin/glib-compile-schemas "$schemas_dir"
${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
locale_dir="$share_dir/locale"
mkdir -p "$locale_dir"

2
pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
View File

@ -34,7 +34,7 @@ plasmaPackage rec {
})
./0003-tzdir.patch
];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"

2
pkgs/development/compilers/aliceml/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation {
'';
buildPhase = ''
gmp="${gmp}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
gmp="${gmp.dev}" zlib="${zlib.dev}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
'';
meta = {

4
pkgs/development/compilers/ecl/default.nix
View File

@ -28,8 +28,8 @@ stdenv.mkDerivation {
};
configureFlags = [
"--enable-threads"
"--with-gmp-prefix=${gmp}"
"--with-libffi-prefix=${libffi}"
"--with-gmp-prefix=${gmp.dev}"
"--with-libffi-prefix=${libffi.dev}"
]
++
(stdenv.lib.optional (! noUnicode)

8
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -165,7 +165,7 @@ stdenv.mkDerivation ({
++ stdenv.lib.optional (libpthread != null) libpthread;
extraCPPSpec =
concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps));
(map (x: "-I${x.dev or x}/include") extraCPPDeps));
extraLibSpec =
if libpthreadCross != null
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
@ -234,8 +234,8 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
@ -323,7 +323,7 @@ stdenv.mkDerivation ({
# Likewise, the LTO code doesn't find zlib.
CPATH = concatStrings
(intersperse ":" (map (x: x + "/include")
(intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs

8
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -215,7 +215,7 @@ stdenv.mkDerivation ({
++ stdenv.lib.optional (libpthread != null) libpthread;
extraCPPSpec =
concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps));
(map (x: "-I${x.dev or x}/include") extraCPPDeps));
extraLibSpec =
if libpthreadCross != null
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
@ -295,8 +295,8 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
@ -398,7 +398,7 @@ stdenv.mkDerivation ({
# Likewise, the LTO code doesn't find zlib.
CPATH = concatStrings
(intersperse ":" (map (x: x + "/include")
(intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs

8
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -241,7 +241,7 @@ stdenv.mkDerivation ({
++ stdenv.lib.optional (libpthread != null) libpthread;
extraCPPSpec =
concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps));
(map (x: "-I${x.dev or x}/include") extraCPPDeps));
extraLibSpec =
if libpthreadCross != null
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
@ -338,8 +338,8 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
@ -460,7 +460,7 @@ stdenv.mkDerivation ({
# Likewise, the LTO code doesn't find zlib.
CPATH = concatStrings
(intersperse ":" (map (x: x + "/include")
(intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs

8
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -244,7 +244,7 @@ stdenv.mkDerivation ({
++ stdenv.lib.optional (libpthread != null) libpthread;
extraCPPSpec =
concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps));
(map (x: "-I${x.dev or x}/include") extraCPPDeps));
extraLibSpec =
if libpthreadCross != null
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
@ -345,8 +345,8 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
@ -467,7 +467,7 @@ stdenv.mkDerivation ({
# Likewise, the LTO code doesn't find zlib.
CPATH = concatStrings
(intersperse ":" (map (x: x + "/include")
(intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs

8
pkgs/development/compilers/gcc/5/default.nix
View File

@ -242,7 +242,7 @@ stdenv.mkDerivation ({
++ stdenv.lib.optional (libpthread != null) libpthread;
extraCPPSpec =
concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps));
(map (x: "-I${x.dev or x}/include") extraCPPDeps));
extraLibSpec =
if libpthreadCross != null
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
@ -339,8 +339,8 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
@ -460,7 +460,7 @@ stdenv.mkDerivation ({
# Likewise, the LTO code doesn't find zlib.
CPATH = concatStrings
(intersperse ":" (map (x: x + "/include")
(intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs

13
pkgs/development/compilers/gcc/builder.sh
View File

@ -201,23 +201,20 @@ postConfigure() {
preInstall() {
# Make ‘lib64’ a symlink to ‘lib’.
# Make ‘lib64’ symlinks to ‘lib’.
if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
mkdir -p $out/lib
ln -s lib $out/lib64
mkdir -p "$out/lib"
ln -s lib "$out/lib64"
mkdir -p "$lib/lib"
ln -s lib "$lib/lib64"
fi
}
postInstall() {
mkdir -p "$lib" # some configs don't have anything to put into $lib
# Move runtime libraries to $lib.
moveToOutput "lib/lib*.so*" "$lib"
moveToOutput "lib/lib*.la" "$lib"
if [ -d "$lib/lib" ]; then
ln -s lib "$lib/lib64" # for *.la
fi
moveToOutput "share/gcc-*/python" "$lib"
for i in "$lib"/lib/*.{la,py}; do

4
pkgs/development/compilers/gcc/gfortran-darwin.nix
View File

@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
--enable-checking=release
--enable-languages=fortran
--with-cloog=${cloog}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-isl=${isl_0_14}
--with-mpc=${libmpc}
--with-mpfr=${mpfr}
--with-mpfr=${mpfr.dev}
--with-native-system-header-dir=${Libsystem}/include
--with-system-zlib
'';

2
pkgs/development/compilers/ghc/7.0.4-binary.nix
View File

@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
./configure --prefix=$out \
--with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
--with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
'';

2
pkgs/development/compilers/ghc/7.4.2-binary.nix
View File

@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
./configure --prefix=$out \
--with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
--with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
'';

4
pkgs/development/compilers/ghc/8.0.1.nix
View File

@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-gcc=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib"
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optional stdenv.isDarwin [
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
];

2
pkgs/development/compilers/hhvm/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
MYSQL_DIR=mariadb;
# work around broken build system
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
prePatch = ''
substituteInPlace hphp/util/generate-buildinfo.sh \

2
pkgs/development/compilers/llvm/3.4/llvm.nix
View File

@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_REQUIRES_RTTI=1"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";

2
pkgs/development/compilers/llvm/3.5/llvm.nix
View File

@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/3.6/llvm.nix
View File

@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/3.7/llvm.nix
View File

@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"

2
pkgs/development/compilers/mono/llvm.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";

2
pkgs/development/compilers/opendylan/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
./autogen.sh
'';
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}";
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.dev}";
buildPhase = "make 3-stage-bootstrap";
postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";

2
pkgs/development/compilers/urweb/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
'';
configureFlags = "--with-openssl=${openssl}";
configureFlags = "--with-openssl=${openssl.dev}";
preConfigure = ''
export PGHEADER="${postgresql}/include/libpq-fe.h";

2
pkgs/development/interpreters/erlang/R16.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
postInstall = let
manpages = fetchurl {

2
pkgs/development/interpreters/erlang/R17.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'';
configureFlags= [
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"

2
pkgs/development/interpreters/erlang/R18.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'';
configureFlags= [
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"

4
pkgs/development/interpreters/guile/default.nix
View File

@ -97,10 +97,10 @@
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${gmp}"
"--with-libgmp-prefix=${gmp.dev}"
# Same for these (?).
"--with-libreadline-prefix=${readline}"
"--with-libreadline-prefix=${readline.dev}"
"--with-libunistring-prefix=${libunistring}"
# See below.

Some files were not shown because too many files have changed in this diff Show More