mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts: pkgs/development/compilers/gcc/4.6/default.nix pkgs/development/compilers/gcc/4.7/default.nix The 4.7 had some weird parameters added in crossAttrs; I've removed them, but I don't understand where they come from.
This commit is contained in:
Lluís Batlle i Rossell
commit
719ba63004
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# Then build the plugins.
|
||||
(
|
||||
buildNativeInputs="$out $buildNativeInputs" # to find audacious
|
||||
nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
|
||||
source $stdenv/setup
|
||||
rm -rfv audacious-*
|
||||
src=$pluginsSrc
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
|
||||
|
||||
buildNativeInputs = [ groff ];
|
||||
nativeBuildInputs = [ groff ];
|
||||
buildInputs = [ id3lib ];
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
|
||||
minixml zlib ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
buildNativeInputs = [ texinfo texLive ];
|
||||
nativeBuildInputs = [ texinfo texLive ];
|
||||
|
||||
configurePhase =
|
||||
'' sed -i mk/default.mk \
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ kdevplatform kdebase_workspace okteta ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
|
||||
nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
|
||||
|
||||
patches =
|
||||
[ ( fetchurl {
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ cmake gettext ];
|
||||
nativeBuildInputs = [ cmake gettext ];
|
||||
buildInputs = [ kdelibs ];
|
||||
|
||||
# for KDE 4.7 the nl translations fail since kile-2.1.2
|
||||
|
||||
@ -13,7 +13,7 @@ composableDerivation {} {
|
||||
|
||||
configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
|
||||
|
||||
buildNativeInputs = [ncurses pkgconfig]
|
||||
nativeBuildInputs = [ncurses pkgconfig]
|
||||
++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib
|
||||
libICE ];
|
||||
|
||||
@ -27,11 +27,11 @@ composableDerivation {} {
|
||||
// edf { name = "xsmp"; } #Disable XSMP session management
|
||||
// edf { name = "xsmp_interact"; } #Disable XSMP interaction
|
||||
// edf { name = "mzscheme"; } #Include MzScheme interpreter.
|
||||
// edf { name = "perl"; feat = "perlinterp"; enable = { buildNativeInputs = [perl]; };} #Include Perl interpreter.
|
||||
// edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
|
||||
// edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
|
||||
// edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
|
||||
// edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
|
||||
// edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
|
||||
// edf { name = "python"; feat = "pythoninterp"; enable = { nativeBuildInputs = [python]; }; } #Include Python interpreter.
|
||||
// edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
|
||||
// edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
|
||||
// edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
|
||||
// edf { name = "cscope"; } #Include cscope interface.
|
||||
// edf { name = "workshop"; } #Include Sun Visual Workshop support.
|
||||
// edf { name = "netbeans"; } #Disable NetBeans integration support.
|
||||
@ -42,7 +42,7 @@ composableDerivation {} {
|
||||
// edf { name = "fontset"; } #Include X fontset output support.
|
||||
// edf { name = "acl"; } #Don't check for ACL support.
|
||||
// edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
|
||||
// edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()).
|
||||
// edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
|
||||
;
|
||||
|
||||
cfg = {
|
||||
@ -70,11 +70,11 @@ composableDerivation {} {
|
||||
|
||||
postInstall = "
|
||||
rpath=`patchelf --print-rpath \$out/bin/vim`;
|
||||
for i in $\buildNativeInputs; do
|
||||
for i in $\nativeBuildInputs; do
|
||||
echo adding \$i/lib
|
||||
rpath=\$rpath:\$i/lib
|
||||
done
|
||||
echo \$buildNativeInputs
|
||||
echo \$nativeBuildInputs
|
||||
echo \$rpath
|
||||
patchelf --set-rpath \$rpath \$out/bin/{vim,gvim}
|
||||
";
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses pkgconfig ];
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-multibyte"
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses boehmgc ];
|
||||
buildNativeInputs = [ help2man perl ];
|
||||
nativeBuildInputs = [ help2man perl ];
|
||||
|
||||
# Tests can't be run because most of them rely on the ability to
|
||||
# fiddle with the terminal.
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./install.patch ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
NIX_LDFLAGS = "-llcms -ljpeg";
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
libxslt docbook_xsl libart_lgpl
|
||||
] ++ stdenv.lib.optional withGNOME libgnomeui;
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool perl ];
|
||||
nativeBuildInputs = [ pkgconfig intltool perl ];
|
||||
|
||||
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ cmake automoc4 pkgconfig ];
|
||||
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
|
||||
|
||||
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
|
||||
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [djvulibre qt4];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
patches = [ ./djview4-qt-4.8.patch ];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig which ];
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
buildInputs =
|
||||
[ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
|
||||
imagemagick curl saneBackends
|
||||
|
||||
@ -36,7 +36,7 @@ let
|
||||
libLQR = pluginDerivation {
|
||||
name = "liblqr-1-0.4.1";
|
||||
# required by lqrPlugin, you don't havet to install this lib explicitely
|
||||
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
|
||||
sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
|
||||
@ -50,7 +50,7 @@ rec {
|
||||
Video
|
||||
*/
|
||||
name = "gap-2.6.0";
|
||||
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
|
||||
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
|
||||
@ -74,7 +74,7 @@ rec {
|
||||
Filters/Generic/FFT Inverse
|
||||
*/
|
||||
name = "fourier-0.3.3";
|
||||
buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.nativeBuildInputs;
|
||||
postInstall = "fail";
|
||||
installPhase = "installPlugins fourier";
|
||||
src = fetchurl {
|
||||
@ -91,7 +91,7 @@ rec {
|
||||
Filters/Enhance/Smart remove selection
|
||||
*/
|
||||
name = "resynthesizer-0.16";
|
||||
buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp pkgs.fftw ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
|
||||
sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
|
||||
@ -105,7 +105,7 @@ rec {
|
||||
|
||||
texturize = pluginDerivation {
|
||||
name = "texturize-2.1";
|
||||
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
|
||||
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
|
||||
@ -118,7 +118,7 @@ rec {
|
||||
Filters/Enhance/Wavelet sharpen
|
||||
*/
|
||||
name = "wavelet-sharpen-0.1.2";
|
||||
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
|
||||
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
|
||||
@ -131,7 +131,7 @@ rec {
|
||||
Layer/Liquid Rescale
|
||||
*/
|
||||
name = "lqr-plugin-0.6.1";
|
||||
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
|
||||
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
|
||||
@ -146,7 +146,7 @@ rec {
|
||||
let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
|
||||
in pluginDerivation {
|
||||
name = "gmic-1.3.2.0";
|
||||
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
|
||||
sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
|
||||
@ -172,7 +172,7 @@ rec {
|
||||
# or use the binary
|
||||
ufraw = pluginDerivation {
|
||||
name = "ufraw-0.15";
|
||||
buildInputs = [pkgs.lcms gimp] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [pkgs.lcms gimp] ++ gimp.nativeBuildInputs;
|
||||
# --enable-mime - install mime files, see README for more information
|
||||
# --enable-extras - build extra (dcraw, nikon-curve) executables
|
||||
# --enable-dst-correction - enable DST correction for file timestamps.
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
zlib libtool
|
||||
];
|
||||
|
||||
buildNativeInputs = [ xz ];
|
||||
nativeBuildInputs = [ xz ];
|
||||
|
||||
postInstall = ''
|
||||
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
|
||||
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig cmake automoc4 ];
|
||||
nativeBuildInputs = [ pkgconfig cmake automoc4 ];
|
||||
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
|
||||
@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ kdelibs imlib ];
|
||||
|
||||
buildNativeInputs = [ cmake gettext pkgconfig ];
|
||||
nativeBuildInputs = [ cmake gettext pkgconfig ];
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [saneBackends libX11 gtk pkgconfig] ++
|
||||
(if (libusb != null) then [libusb] else []);
|
||||
(if libusb != null then [libusb] else []);
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.sane-project.org/";
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++
|
||||
(if (libusb != null) then [libusb] else []);
|
||||
(if libusb != null then [libusb] else []);
|
||||
|
||||
meta = {
|
||||
homepage = http://www.sane-project.org/;
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ automake pkgconfig gettext perl zip ];
|
||||
nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
|
||||
buildInputs = [ wxGTK gtk libxml2 freetype pango ];
|
||||
|
||||
configureFlags = "--disable-svnversion";
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
|
||||
|
||||
buildNativeInputs = [ imake makeWrapper ];
|
||||
nativeBuildInputs = [ imake makeWrapper ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
pango libX11 xproto zlib poppler poppler_data
|
||||
];
|
||||
|
||||
buildNativeInputs = [ autoconf automake libtool pkgconfig ];
|
||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
|
||||
|
||||
# Build with poppler-0.18.x
|
||||
patchFlags = "-p0";
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit python;
|
||||
|
||||
buildNativeInputs = [ makeWrapper pkgconfig ];
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||
|
||||
buildInputs =
|
||||
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0bcpmnlk03382x577qbnbw3i6y08hr3qmg85pqj35scnl6van74c";
|
||||
};
|
||||
|
||||
buildNativeInputs = [
|
||||
nativeBuildInputs = [
|
||||
glibc
|
||||
glib
|
||||
stdenv.gcc.gcc
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation {
|
||||
chmod +x $out/bin/googleearth
|
||||
|
||||
fullPath=
|
||||
for i in $buildNativeInputs; do
|
||||
for i in $nativeBuildInputs; do
|
||||
fullPath=$fullPath:$i/lib
|
||||
done
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig gettext ];
|
||||
nativeBuildInputs = [ pkgconfig gettext ];
|
||||
buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ kdelibs ];
|
||||
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "KDE Wacom graphic tablet configuration tool";
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-all"
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
|
||||
fcgi ];
|
||||
|
||||
buildNativeInputs = [ cmake python];
|
||||
nativeBuildInputs = [ cmake python];
|
||||
|
||||
patches = [ ./r14988.diff ];
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
buildInputs = [ kdelibs kdebase_workspace ];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
description = "GTD (getting things done) implementation";
|
||||
|
||||
@ -69,7 +69,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
|
||||
makeFlags = if (wxGUI) then "" else "NOGUI=1";
|
||||
makeFlags = if wxGUI then "" else "NOGUI=1";
|
||||
|
||||
meta = {
|
||||
description = "Free Open-Source filesystem on-the-fly encryption";
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ kdelibs ];
|
||||
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
meta = {
|
||||
homepage = http://yakuake.kde.org;
|
||||
|
||||
@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
propagatedBuildInputs = [ ncurses.hostDrv zlib.hostDrv openssl.hostDrv ];
|
||||
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
|
||||
configureFlags = ''
|
||||
--enable-finger --enable-html-highlight
|
||||
--enable-gopher --enable-cgi --enable-bittorrent --enable-nntp
|
||||
--with-openssl=${openssl.hostDrv}
|
||||
--with-bzip2=${bzip2.hostDrv}
|
||||
--with-openssl=${openssl.crossDrv}
|
||||
--with-bzip2=${bzip2.crossDrv}
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
|
||||
++ stdenv.lib.optional enableDirectFB [ directfb ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig bzip2 ];
|
||||
nativeBuildInputs = [ pkgconfig bzip2 ];
|
||||
|
||||
configureFlags = [ "--with-ssl" ]
|
||||
++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
configureFlags = if sslSupport then "--with-ssl" else "";
|
||||
|
||||
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl;
|
||||
buildNativeInputs = [ ncurses ];
|
||||
nativeBuildInputs = [ ncurses ];
|
||||
|
||||
crossAttrs = {
|
||||
configureFlags = "--enable-widec" +
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ kdelibs qca2 qoauth ];
|
||||
|
||||
buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ];
|
||||
nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ];
|
||||
|
||||
buildNativeInputs = [ intltool pkgconfig ];
|
||||
nativeBuildInputs = [ intltool pkgconfig ];
|
||||
|
||||
configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
cp -r * $out/libexec/skype/
|
||||
|
||||
fullPath=
|
||||
for i in $buildNativeInputs; do
|
||||
for i in $nativeBuildInputs; do
|
||||
fullPath=$fullPath''${fullPath:+:}$i/lib
|
||||
done
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf";
|
||||
};
|
||||
|
||||
buildNativeInputs = [pkgconfig libxslt];
|
||||
nativeBuildInputs = [pkgconfig libxslt];
|
||||
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
|
||||
|
||||
configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig libxslt ];
|
||||
nativeBuildInputs = [ pkgconfig libxslt ];
|
||||
|
||||
meta = {
|
||||
description = "A Telepathy connection manager based on libpurple";
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ];
|
||||
};
|
||||
|
||||
extraBuildNativeInputs = {
|
||||
extraNativeBuildInputs = {
|
||||
telepathy_logger_qt = [ flex bison ];
|
||||
};
|
||||
|
||||
@ -37,7 +37,7 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildNativeInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraBuildNativeInputs);
|
||||
nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
|
||||
buildInputs = [ kdelibs telepathy_qt ]
|
||||
++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
|
||||
++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ];
|
||||
|
||||
buildNativeInputs = [ libxslt ];
|
||||
nativeBuildInputs = [ libxslt ];
|
||||
|
||||
configureFlags = "--enable-call";
|
||||
|
||||
|
||||
@ -11,5 +11,5 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ telepathy_glib ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig libxslt ];
|
||||
nativeBuildInputs = [ pkgconfig libxslt ];
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
|
||||
};
|
||||
|
||||
buildNativeInputs = [pkgconfigUpstream libxslt python];
|
||||
nativeBuildInputs = [pkgconfigUpstream libxslt python];
|
||||
buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
|
||||
sqlite ];
|
||||
|
||||
buildNativeInputs = [ libxslt pkgconfigUpstream ];
|
||||
nativeBuildInputs = [ libxslt pkgconfigUpstream ];
|
||||
|
||||
configureFlags = "--disable-avahi-tests";
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
|
||||
|
||||
buildInputs = stdenv.lib.optional enableACLs acl;
|
||||
buildNativeInputs = [perl];
|
||||
nativeBuildInputs = [perl];
|
||||
|
||||
meta = {
|
||||
homepage = http://samba.anu.edu.au/rsync/;
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
|
||||
done
|
||||
'' else "";
|
||||
|
||||
dontStrip = if ! ocaml.nativeCompilers then true else false;
|
||||
dontStrip = !ocaml.nativeCompilers;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
|
||||
|
||||
buildNativeInputs = [ cmake gettext ];
|
||||
nativeBuildInputs = [ cmake gettext ];
|
||||
|
||||
meta = {
|
||||
description = "A multi-purpose note-taking application";
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ cmake perl pkgconfig ];
|
||||
nativeBuildInputs = [ cmake perl pkgconfig ];
|
||||
|
||||
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
|
||||
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
|
||||
buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
|
||||
nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
|
||||
|
||||
KDEDIRS = libalkimia;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ kdelibs grantlee qca2 libofx ];
|
||||
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
meta = {
|
||||
inherit (kdelibs.meta) platforms;
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
propagatedBuildInputs = [ cln ];
|
||||
buildInputs = [ readline ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags = "--disable-rpath";
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# Perl is only for the documentation
|
||||
buildNativeInputs = [ perl ];
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
patches = [ ./gcc43.patch ];
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
|
||||
|
||||
buildNativeInputs = [ cmake makeWrapper ];
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
|
||||
doCheck = false;
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl readline sqlite ];
|
||||
buildNativeInputs = [ tcl ];
|
||||
nativeBuildInputs = [ tcl ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ apr aprutil subversion db4 kdelibs ];
|
||||
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
meta = {
|
||||
description = "KDE SVN front-end";
|
||||
|
||||
@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional libpngSupport libpng
|
||||
;
|
||||
|
||||
buildNativeInputs = [ yasm ];
|
||||
nativeBuildInputs = [ yasm ];
|
||||
|
||||
postConfigure = ''
|
||||
echo CONFIG_MPEGAUDIODSP=yes >> config.mak
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ];
|
||||
buildNativeInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A media player for KDE based on Nepomuk and Phonon";
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec{
|
||||
};
|
||||
|
||||
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ];
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
meta = {
|
||||
description = "Tools for generating DVD files to be played on standalone DVD players";
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# this is the bare minimum configuration, as I'm only interested in MP4Box
|
||||
# For most other functionality, this should probably be extended
|
||||
buildNativeInputs = [ pkgconfig zlib ];
|
||||
nativeBuildInputs = [ pkgconfig zlib ];
|
||||
|
||||
meta = {
|
||||
description = "Open Source multimedia framework for research and academic purposes";
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig which ];
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
|
||||
patches = [ ./settings.patch ];
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
libdc1394 libraw1394
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-alsa"
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig shared_mime_info ];
|
||||
nativeBuildInputs = [ pkgconfig shared_mime_info ];
|
||||
|
||||
buildInputs =
|
||||
[ xineLib libpng readline ncurses curl lirc libjpeg
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildPhase = "make";
|
||||
|
||||
buildNativeInputs = [ makeWrapper pythonPackages.wrapPython ];
|
||||
nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ];
|
||||
|
||||
# patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall
|
||||
# example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
|
||||
|
||||
@ -20,21 +20,21 @@ let inherit (builtins) head tail trace; in
|
||||
else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
|
||||
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
|
||||
(hasSuffixHack ".tbz" s) then "tbz2"
|
||||
else if (hasSuffixHack ".tar.Z" s) then "tZ"
|
||||
else if (hasSuffixHack ".tar.lzma" s) then "tar.lzma"
|
||||
else if (hasSuffixHack ".tar.xz" s) then "tar.xz"
|
||||
else if hasSuffixHack ".tar.Z" s then "tZ"
|
||||
else if hasSuffixHack ".tar.lzma" s then "tar.lzma"
|
||||
else if hasSuffixHack ".tar.xz" s then "tar.xz"
|
||||
else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
|
||||
else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
|
||||
else if (hasSuffixHack "-git-export" s) then "git-dir"
|
||||
else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
|
||||
else if (hasSuffixHack ".rpm" s) then "rpm"
|
||||
else if hasSuffixHack "-cvs-export" s then "cvs-dir"
|
||||
else if hasSuffixHack "-git-export" s then "git-dir"
|
||||
else if hasSuffixHack ".nar.bz2" s then "narbz2"
|
||||
else if hasSuffixHack ".rpm" s then "rpm"
|
||||
|
||||
# Mostly for manually specified directories..
|
||||
else if (hasSuffixHack "/" s) then "dir"
|
||||
else if hasSuffixHack "/" s then "dir"
|
||||
|
||||
# Last block - for single files!! It should be always after .tar.*
|
||||
else if (hasSuffixHack ".bz2" s) then "plain-bz2"
|
||||
else if (hasSuffixHack ".gz" s) then "plain-gz"
|
||||
else if hasSuffixHack ".bz2" s then "plain-bz2"
|
||||
else if hasSuffixHack ".gz" s then "plain-gz"
|
||||
|
||||
# For bootstrap calls
|
||||
else if (s ==("" + (substring 0 0 s))) then "empty"
|
||||
@ -391,7 +391,7 @@ let inherit (builtins) head tail trace; in
|
||||
|
||||
cmakeFlags = attrByPath ["cmakeFlags"] [] args;
|
||||
|
||||
cmakeRPathFlag = if (attrByPath ["cmakeSkipRpath "] true args) then " -DCMAKE_SKIP_BUILD_RPATH=ON " else "";
|
||||
cmakeRPathFlag = if attrByPath ["cmakeSkipRpath "] true args then " -DCMAKE_SKIP_BUILD_RPATH=ON " else "";
|
||||
|
||||
cmakeBuildDir = attrByPath ["cmakeBuildDir"] "build" args;
|
||||
|
||||
@ -508,7 +508,7 @@ let inherit (builtins) head tail trace; in
|
||||
);
|
||||
|
||||
builderDefsPackage = bd: func:
|
||||
if (builtins.isFunction func) then
|
||||
if builtins.isFunction func then
|
||||
(foldArgs
|
||||
(x: y: ((func (bd // x // y)) // y))
|
||||
(innerBuilderDefsPackage bd)
|
||||
@ -588,7 +588,7 @@ let inherit (builtins) head tail trace; in
|
||||
url = srcInfo.url;
|
||||
sha256 = srcInfo.hash;
|
||||
} //
|
||||
(if (srcInfo ? downloadName) then {name = srcInfo.downloadName;} else {}));
|
||||
(if srcInfo ? downloadName then {name = srcInfo.downloadName;} else {}));
|
||||
|
||||
fetchGitFromSrcInfo = srcInfo: fetchgit {
|
||||
url = srcInfo.url;
|
||||
|
||||
@ -91,7 +91,7 @@
|
||||
test -f $i && ghc --make $i
|
||||
done
|
||||
|
||||
for p in $extraBuildInputs $propagatedBuildNativeInputs; do
|
||||
for p in $extraBuildInputs $propagatedNativeBuildInputs; do
|
||||
if [ -d "$p/include" ]; then
|
||||
extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
|
||||
fi
|
||||
@ -143,8 +143,8 @@
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
if test -f $out/nix-support/propagated-build-native-inputs; then
|
||||
ln -s $out/nix-support/propagated-build-native-inputs $out/nix-support/propagated-user-env-packages
|
||||
if test -f $out/nix-support/propagated-native-build-inputs; then
|
||||
ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
|
||||
fi
|
||||
'';
|
||||
|
||||
|
||||
@ -8,14 +8,14 @@ with lib;
|
||||
|
||||
let
|
||||
findInList = p: list: default:
|
||||
if (list == []) then default else
|
||||
if list == [] then default else
|
||||
if (p (head list)) then (head list) else
|
||||
findInList p (tail list) default;
|
||||
|
||||
|
||||
checkAttrInclusion = s: a: b:
|
||||
(
|
||||
if (! isAttrs b) then s else
|
||||
if ! isAttrs b then s else
|
||||
if (lib.attrByPath ["_type"] "" b) == "option" then "" else
|
||||
findInList (x : x != "")
|
||||
( map (x: if (x == "servicesProposal") # this attr will be checked at another place ( -> upstart-jobs/default.nix )
|
||||
|
||||
@ -47,11 +47,11 @@ stdenv.mkDerivation {
|
||||
else shell;
|
||||
|
||||
crossAttrs = {
|
||||
shell = shell.hostDrv + shell.hostDrv.shellPath;
|
||||
libc = libc.hostDrv;
|
||||
coreutils = coreutils.hostDrv;
|
||||
binutils = binutils.hostDrv;
|
||||
clang = clang.hostDrv;
|
||||
shell = shell.crossDrv + shell.crossDrv.shellPath;
|
||||
libc = libc.crossDrv;
|
||||
coreutils = coreutils.crossDrv;
|
||||
binutils = binutils.crossDrv;
|
||||
clang = clang.crossDrv;
|
||||
#
|
||||
# This is not the best way to do this. I think the reference should be
|
||||
# the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
# TODO: statically check if mercurial as the https support if the url starts woth https.
|
||||
stdenv.mkDerivation {
|
||||
name = "hg-archive" + (if (name != null) then "-${name}" else "");
|
||||
name = "hg-archive" + (if name != null then "-${name}" else "");
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [mercurial];
|
||||
|
||||
# Nix <= 0.7 compatibility.
|
||||
id = md5;
|
||||
|
||||
outputHashAlgo = if (md5 != null) then "md5" else "sha256";
|
||||
outputHashAlgo = if md5 != null then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if (md5 != null) then md5 else sha256;
|
||||
outputHash = if md5 != null then md5 else sha256;
|
||||
|
||||
inherit url tag;
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
buildNativeInputs = [monotone];
|
||||
nativeBuildInputs = [monotone];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
utils = ./utils.sh;
|
||||
addFlags = ./add-flags;
|
||||
inherit nativeTools nativeLibc nativePrefix gcc libc binutils;
|
||||
crossConfig = if (cross != null) then cross.config else null;
|
||||
crossConfig = if cross != null then cross.config else null;
|
||||
gccLibs = if gcc != null then gccLibs else null;
|
||||
name = chosenName;
|
||||
langC = if nativeTools then true else gcc.langC;
|
||||
|
||||
@ -50,17 +50,17 @@ stdenv.mkDerivation ({
|
||||
langFortran = if nativeTools then false else gcc ? langFortran;
|
||||
langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;
|
||||
langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
|
||||
zlib = if (gcc != null && gcc ? langVhdl) then zlib else null;
|
||||
zlib = if gcc != null && gcc ? langVhdl then zlib else null;
|
||||
shell = if shell == "" then stdenv.shell else
|
||||
if builtins.isAttrs shell then (shell + shell.shellPath)
|
||||
else shell;
|
||||
|
||||
crossAttrs = {
|
||||
shell = shell.hostDrv + shell.hostDrv.shellPath;
|
||||
libc = libc.hostDrv;
|
||||
coreutils = coreutils.hostDrv;
|
||||
binutils = binutils.hostDrv;
|
||||
gcc = gcc.hostDrv;
|
||||
shell = shell.crossDrv + shell.crossDrv.shellPath;
|
||||
libc = libc.crossDrv;
|
||||
coreutils = coreutils.crossDrv;
|
||||
binutils = binutils.crossDrv;
|
||||
gcc = gcc.crossDrv;
|
||||
#
|
||||
# This is not the best way to do this. I think the reference should be
|
||||
# the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
|
||||
|
||||
@ -22,7 +22,7 @@ in
|
||||
stdenv.mkDerivation {
|
||||
name = "initrd";
|
||||
builder = ./make-initrd.sh;
|
||||
buildNativeInputs = inputsFun stdenv.platform.uboot;
|
||||
nativeBuildInputs = inputsFun stdenv.platform.uboot;
|
||||
|
||||
makeUInitrd = makeUInitrdFun stdenv.platform.uboot;
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
||||
pathsFromGraph = ./paths-from-graph.pl;
|
||||
|
||||
crossAttrs = {
|
||||
buildNativeInputs = inputsFun stdenv.cross.platform.uboot;
|
||||
nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
|
||||
makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
preConfigurePhases+=" autoreconfPhase"
|
||||
|
||||
for i in @autoconf@ @automake@ @libtool@; do
|
||||
findInputs $i nativePkgs propagated-build-native-inputs
|
||||
findInputs $i nativePkgs propagated-native-build-inputs
|
||||
done
|
||||
|
||||
autoreconfPhase() {
|
||||
|
||||
@ -55,7 +55,7 @@ rec {
|
||||
mkdir -p $out/nix-support
|
||||
cp ${script} $out/nix-support/setup-hook
|
||||
'' + stdenv.lib.optionalString (deps != []) ''
|
||||
echo ${toString deps} > $out/nix-support/propagated-build-native-inputs
|
||||
echo ${toString deps} > $out/nix-support/propagated-native-build-inputs
|
||||
'' + stdenv.lib.optionalString (substitutions != {}) ''
|
||||
substituteAll ${script} $out/nix-support/setup-hook
|
||||
'');
|
||||
|
||||
@ -8,5 +8,5 @@ stdenv.mkDerivation {
|
||||
sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ itstool libxml2 gettext ];
|
||||
nativeBuildInputs = [ itstool libxml2 gettext ];
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ glib ];
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
meta = {
|
||||
inherit (glib.meta) maintainers platforms;
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
|
||||
buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ];
|
||||
nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ];
|
||||
|
||||
patches = [ ./eo.patch ];
|
||||
|
||||
|
||||
@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool iconnamingutils gtk ];
|
||||
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
|
||||
}
|
||||
|
||||
@ -13,5 +13,5 @@ stdenv.mkDerivation {
|
||||
|
||||
propagatedBuildInputs = [ glib libtasn1 ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
libtasn1 libtool libcanberra
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool which ];
|
||||
nativeBuildInputs = [ pkgconfig intltool which ];
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
|
||||
NIX_CFLAGS_COMPILE="-I${GConf}/include/gconf/2";
|
||||
|
||||
@ -13,5 +13,5 @@ stdenv.mkDerivation {
|
||||
[ dbus_glib gtk libXau libXtst inputproto libglade startup_notification
|
||||
GConf upower
|
||||
];
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
}
|
||||
|
||||
@ -14,5 +14,5 @@ stdenv.mkDerivation {
|
||||
pulseaudio
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
|
||||
@ -12,5 +12,5 @@ stdenv.mkDerivation {
|
||||
configureFlags = "--disable-scrollkeeper";
|
||||
buildInputs = [ gtk libglade libxml2 libxslt libX11 ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ];
|
||||
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit gtk ];
|
||||
propagatedBuildInputs = [ glib ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
configureFlags = "--with-gtk=2.0";
|
||||
}
|
||||
|
||||
@ -9,6 +9,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ glib libIDL ];
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
|
||||
};
|
||||
|
||||
buildNativeInputs = [pkgconfig];
|
||||
nativeBuildInputs = [pkgconfig];
|
||||
|
||||
propagatedBuildInputs = [ GConf gtkmm glibmm ];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./gdk.patch ];
|
||||
|
||||
buildNativeInputs = [pkgconfig];
|
||||
nativeBuildInputs = [pkgconfig];
|
||||
|
||||
propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ];
|
||||
|
||||
|
||||
@ -11,5 +11,5 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ glib gettext ];
|
||||
|
||||
buildNativeInputs = [ flex bison pkgconfig ];
|
||||
nativeBuildInputs = [ flex bison pkgconfig ];
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
preConfigure = "export USER=`whoami`";
|
||||
buildNativeInputs = [ flex bison pkgconfig intltool procps ];
|
||||
nativeBuildInputs = [ flex bison pkgconfig intltool procps ];
|
||||
buildInputs = [ libxml2 ];
|
||||
propagatedBuildInputs = [ popt glib ORBit2 ];
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
|
||||
propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
|
||||
propagatedBuildInputs = [ glib libbonobo ];
|
||||
}
|
||||
|
||||
@ -10,6 +10,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ libglade ];
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
propagatedBuildInputs = [ libart_lgpl gtk ];
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
buildInputs =
|
||||
[ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ];
|
||||
|
||||
|
||||
@ -9,6 +9,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gtk ];
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user