Merge staging into master
Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix
This commit is contained in:
commit
8c4aeb1780
|
@ -29,15 +29,15 @@
|
|||
|
||||
<section><title>Using a split package</title>
|
||||
<para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para>
|
||||
<para>When a multiple-output derivation gets into a build input of another derivation, the first output is added (<varname>.dev</varname> by convention) and also <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname>. (See <xref linkend="multiple-output-file-type-groups" />.)</para>
|
||||
<para>When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.)</para>
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>Writing a split derivation</title>
|
||||
<para>Here you find how to write a derivation that produces multiple outputs.</para>
|
||||
<para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>>; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para>
|
||||
<programlisting>outputs = [ "dev" "out" "bin" "doc" ];</programlisting>
|
||||
<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should usually be <varname>dev</varname>; typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>
|
||||
<programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
|
||||
<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like <literal>${pkgs.perl}/bin/perl</literal> to always work. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>
|
||||
|
||||
<note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note>
|
||||
|
||||
|
|
|
@ -454,6 +454,8 @@ rec {
|
|||
getLib = getOutput "lib";
|
||||
getDev = getOutput "dev";
|
||||
|
||||
/* Pick the outputs of packages to place in buildInputs */
|
||||
chooseDevOutputs = drvs: builtins.map (drv: if drv.outputUnspecified or false then drv.dev or drv else drv) drvs;
|
||||
|
||||
/*** deprecated stuff ***/
|
||||
|
||||
|
|
|
@ -34,6 +34,17 @@ following incompatible changes:</para>
|
|||
|
||||
<itemizedlist>
|
||||
|
||||
<listitem>
|
||||
<para>A large number of packages have been converted to use the multiple outputs feature
|
||||
of Nix to greatly reduce the amount of required disk space. This may require changes
|
||||
to any custom packages to make them build again; see the relevant chapter in the
|
||||
Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions
|
||||
related to multiple-output packages
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were changed</link>
|
||||
late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.)
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Shell aliases for systemd sub-commands
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were dropped</link>:
|
||||
|
@ -66,6 +77,11 @@ following incompatible changes:</para>
|
|||
<literal>environment.variables</literal>.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>The <literal>audit</literal> service is no longer enabled by default.
|
||||
Use <literal>security.audit.enable = true;</literal> to explicitly enable it.</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ with lib;
|
|||
config = {
|
||||
|
||||
fonts.fonts =
|
||||
[ pkgs.xorg.fontbhttf
|
||||
[
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter75dpi
|
||||
pkgs.dejavu_fonts
|
||||
|
|
|
@ -4,6 +4,7 @@ with lib;
|
|||
|
||||
let
|
||||
cfg = config.security.audit;
|
||||
enabled = cfg.enable == "lock" || cfg.enable;
|
||||
|
||||
failureModes = {
|
||||
silent = 0;
|
||||
|
@ -11,6 +12,13 @@ let
|
|||
panic = 2;
|
||||
};
|
||||
|
||||
disableScript = pkgs.writeScript "audit-disable" ''
|
||||
#!${pkgs.stdenv.shell} -eu
|
||||
# Explicitly disable everything, as otherwise journald might start it.
|
||||
auditctl -D
|
||||
auditctl -e 0 -a task,never
|
||||
'';
|
||||
|
||||
# TODO: it seems like people like their rules to be somewhat secret, yet they will not be if
|
||||
# put in the store like this. At the same time, it doesn't feel like a huge deal and working
|
||||
# around that is a pain so I'm leaving it like this for now.
|
||||
|
@ -47,7 +55,7 @@ in {
|
|||
security.audit = {
|
||||
enable = mkOption {
|
||||
type = types.enum [ false true "lock" ];
|
||||
default = true; # The kernel seems to enable it by default with no rules anyway
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable the Linux audit system. The special `lock' value can be used to
|
||||
enable auditing and prevent disabling it until a restart. Be careful about locking
|
||||
|
@ -91,7 +99,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config = mkIf (cfg.enable == "lock" || cfg.enable) {
|
||||
config = {
|
||||
systemd.services.audit = {
|
||||
description = "Kernel Auditing";
|
||||
wantedBy = [ "basic.target" ];
|
||||
|
@ -103,8 +111,8 @@ in {
|
|||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "@${startScript} audit-start";
|
||||
ExecStop = "@${stopScript} audit-stop";
|
||||
ExecStart = "@${if enabled then startScript else disableScript} audit-start";
|
||||
ExecStop = "@${stopScript} audit-stop";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchPhase = ''
|
||||
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
|
||||
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
|
||||
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
|
||||
patchShebangs ./tools/
|
||||
'';
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
#doCheck = true; # takes lots of time
|
||||
|
||||
outputs = [ "dev" "out" "bin" "doc" ];
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://xiph.org/flac/;
|
||||
|
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./imagetragick.patch ] ++ cfg.patches;
|
||||
|
||||
outputs = [ "dev" "out" "doc" ]; # bin/ isn't really big
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
outputMan = "out"; # it's tiny
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" ];
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty;
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
preConfigure = ''
|
||||
cp src/gcconfig.pri.in src/gcconfig.pri
|
||||
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
|
||||
echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri
|
||||
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
'';
|
||||
#postConfigure =
|
||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "prefix=$(out)" ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
|
||||
outputs = [ "out" "bin" "doc" ];
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
preConfigure = ''
|
||||
# Don't remove mujs because upstream version is incompatible
|
||||
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
Description: Library for rendering PDF documents
|
||||
Version: ${version}
|
||||
Libs: -L$out/lib -lmupdf -lmupdfthird
|
||||
Cflags: -I$out/include
|
||||
Cflags: -I$dev/include
|
||||
EOF
|
||||
|
||||
moveToOutput "bin" "$bin"
|
||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-libxml2=${libxml2}"
|
||||
"--with-libxml2=${libxml2.dev}"
|
||||
"--with-libxslt=${libxslt.dev}"
|
||||
];
|
||||
|
||||
|
|
|
@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = "
|
||||
--without-arts --disable-docs
|
||||
--x-includes=${libX11}/include
|
||||
--x-libraries=${libX11}/lib
|
||||
--x-includes=${libX11.dev}/include
|
||||
--x-libraries=${libX11.out}/lib
|
||||
--with-qt-dir=${qt3}
|
||||
";
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
imake
|
||||
libX11 libXt libXext libXpm
|
||||
] ++ stdenv.lib.optional svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
|
||||
] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
|
|||
patchPhase = ''
|
||||
sed -i config.h \
|
||||
-e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \
|
||||
-e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \
|
||||
-e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \
|
||||
-e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11.dev}/include"|' \
|
||||
-e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11.out}/lib"|' \
|
||||
\
|
||||
-e '20 i #define TCL_LIBRARY "${tcl}/lib"' \
|
||||
-e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
let
|
||||
makeFlags = ''
|
||||
INCDIR=${glibc}/include \
|
||||
INCDIR=${glibc.dev}/include \
|
||||
BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
|
||||
USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \
|
||||
TERMCONTROL=-DUSE_TERMIOS \
|
||||
|
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
]
|
||||
++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
|
||||
++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
|
|||
mkdir -p vendor/cache
|
||||
${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)}
|
||||
|
||||
bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2}"
|
||||
bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt.dev}" --with-xml2-dir="${libxml2.dev}"
|
||||
|
||||
bundle install --verbose --local --deployment
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ let
|
|||
};
|
||||
|
||||
# Can't do separate $lib and $bin, as libs reference bins
|
||||
outputs = [ "dev" "out" "man" ];
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
buildInputs = [ zlib apr aprutil sqlite ]
|
||||
++ stdenv.lib.optional httpSupport serf
|
||||
|
|
|
@ -108,7 +108,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
# first line: ugly hack, and it isn't yet clear why it's a problem
|
||||
configurePhase = ''
|
||||
NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${stdenv.cc.libc}/include,,g')
|
||||
NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g')
|
||||
|
||||
cat >> LocalConfig.kmk <<LOCAL_CONFIG
|
||||
VBOX_WITH_TESTCASES :=
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, overrideDerivation
|
||||
|
||||
# required for gcc plugins
|
||||
|
@ -24,7 +25,7 @@ overrideDerivation (kernel.override {
|
|||
inherit extraConfig;
|
||||
ignoreConfigErrors = true;
|
||||
}) (attrs: {
|
||||
nativeBuildInputs = [ gmp libmpc mpfr ] ++ (attrs.nativeBuildInputs or []);
|
||||
nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
|
||||
preConfigure = ''
|
||||
echo ${localver} >localversion-grsec
|
||||
${attrs.preConfigure or ""}
|
||||
|
|
|
@ -160,8 +160,7 @@ _multioutDevs() {
|
|||
done
|
||||
}
|
||||
|
||||
# Make the first output (typically "dev") propagate other outputs needed for development.
|
||||
# Take the first, because that's what one gets when putting the package into buildInputs.
|
||||
# Make the "dev" propagate other outputs needed for development.
|
||||
# Note: with current cross-building setup, all packages are "native" if not cross-building;
|
||||
# however, if cross-building, the outputs are non-native. We have to choose the right file.
|
||||
_multioutPropagateDev() {
|
||||
|
@ -171,13 +170,17 @@ _multioutPropagateDev() {
|
|||
for outputFirst in $outputs; do
|
||||
break
|
||||
done
|
||||
local propagaterOutput="$outputDev"
|
||||
if [ -z "$propagaterOutput" ]; then
|
||||
propagaterOutput="$outputFirst"
|
||||
fi
|
||||
|
||||
# Default value: propagate binaries, includes and libraries
|
||||
if [ -z "${propagatedBuildOutputs+1}" ]; then
|
||||
local po_dirty="$outputBin $outputInclude $outputLib"
|
||||
set +o pipefail
|
||||
propagatedBuildOutputs=`echo "$po_dirty" \
|
||||
| tr -s ' ' '\n' | grep -v -F "$outputFirst" \
|
||||
| tr -s ' ' '\n' | grep -v -F "$propagaterOutput" \
|
||||
| sort -u | tr '\n' ' ' `
|
||||
set -o pipefail
|
||||
fi
|
||||
|
@ -187,7 +190,6 @@ _multioutPropagateDev() {
|
|||
return
|
||||
fi
|
||||
|
||||
mkdir -p "${!outputFirst}"/nix-support
|
||||
local propagatedBuildInputsFile
|
||||
if [ -z "$crossConfig" ]; then
|
||||
propagatedBuildInputsFile=propagated-native-build-inputs
|
||||
|
@ -195,8 +197,9 @@ _multioutPropagateDev() {
|
|||
propagatedBuildInputsFile=propagated-build-inputs
|
||||
fi
|
||||
|
||||
mkdir -p "${!propagaterOutput}"/nix-support
|
||||
for output in $propagatedBuildOutputs; do
|
||||
echo -n " ${!output}" >> "${!outputFirst}"/nix-support/$propagatedBuildInputsFile
|
||||
echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
|
||||
done
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk";
|
||||
};
|
||||
|
||||
outputs = [ "out" "minimal" ];
|
||||
|
||||
buildFlags = "full-ttf";
|
||||
|
||||
preBuild = "patchShebangs scripts";
|
||||
|
@ -22,6 +24,10 @@ stdenv.mkDerivation rec {
|
|||
for i in $(find build -name '*.ttf'); do
|
||||
cp $i $out/share/fonts/truetype;
|
||||
done;
|
||||
'' + ''
|
||||
local fname=share/fonts/truetype/DejaVuSans.ttf
|
||||
moveToOutput "$fname" "$minimal"
|
||||
ln -s "$minimal/$fname" "$out/$fname"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "doc" ];
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
|
||||
# polkit requires pam, which requires shadow.h, which is not available on
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
preBuild = ''
|
||||
sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
preConfigure = # still using stuff deprecated in new glib versions
|
||||
"sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [ pkgconfig gtk python gettext ];
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [ ./new-glib.patch ];
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [ libglade ];
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
|
|
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
|
|||
configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
|
||||
"--disable-libcryptui" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0";
|
||||
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
|
||||
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0";
|
||||
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = "--disable-fatal-warnings";
|
||||
|
||||
NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss}/include/nss"
|
||||
NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
|
||||
"-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
|
||||
|
|
|
@ -36,6 +36,6 @@ plasmaPackage rec {
|
|||
NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
|
||||
cmakeFlags = [
|
||||
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
|
||||
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
|
||||
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg"
|
||||
];
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
# lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
|
||||
buildInputs = [ pkgconfig glib intltool ];
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
|
||||
#TODO: gladeui
|
||||
# By default, libxfcegui4 tries to install into libglade's prefix.
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig intltool dbus_glib gdk_pixbuf curl freetype
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./xfce4-panel-datadir.patch ];
|
||||
patchFlags = "-p1";
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig intltool gtk libxfce4util exo libwnck
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
|
||||
#TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
|
||||
buildInputs = [ pkgconfig intltool glib libxfce4util ];
|
||||
|
|
|
@ -165,8 +165,8 @@ let version = "6.2.0";
|
|||
" --disable-libatomic " + # libatomic requires libc
|
||||
" --disable-decimal-float" # libdecnumber requires libc
|
||||
else
|
||||
(if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
|
||||
else " --with-headers=${libcCross.dev}/include") +
|
||||
(if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
|
||||
else " --with-headers=${getDev libcCross}/include") +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
|
||||
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
|
||||
|
@ -247,7 +247,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}"
|
||||
|
@ -411,6 +411,7 @@ stdenv.mkDerivation ({
|
|||
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
|
||||
--with-gmp=${gmp.crossDrv}
|
||||
--with-mpfr=${mpfr.crossDrv}
|
||||
--with-mpc=${libmpc.crossDrv}
|
||||
--disable-libstdcxx-pch
|
||||
--without-included-gettext
|
||||
--with-system-zlib
|
||||
|
@ -456,7 +457,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
|
||||
|
@ -479,7 +480,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
EXTRA_TARGET_CFLAGS =
|
||||
if cross != null && libcCross != null then [
|
||||
"-idirafter ${libcCross.dev}/include"
|
||||
"-idirafter ${getDev libcCross}/include"
|
||||
]
|
||||
++ optionals (! crossStageStatic) [
|
||||
"-B${libcCross.out}/lib"
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
});
|
||||
|
||||
prePatch = with stdenv.lib; let
|
||||
libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs);
|
||||
libs = concatStringsSep "," (map (lib: "\"${lib.dev}/include\"") buildInputs);
|
||||
in ''
|
||||
sed -i -e '/^search_includes/,/^}/c \
|
||||
search_includes = function(_) { return $array(${libs}) }
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1lak3hyvvb0w9avzmf0a8vayb7vqhj4m709q1czlhvgjb15dbcf1";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev"; # compilation tools
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" "static" ];
|
||||
outputs = [ "bin" "dev" "out" "static" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace \
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" ];
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
nativeBuildInputs = [ perl texinfo ];
|
||||
|
||||
|
|
|
@ -190,7 +190,7 @@ go.stdenv.mkDerivation (
|
|||
enableParallelBuilding = enableParallelBuilding;
|
||||
|
||||
# I prefer to call this dev but propagatedBuildInputs expects $out to exist
|
||||
outputs = args.outputs or [ "out" "bin" ];
|
||||
outputs = args.outputs or [ "bin" "out" ];
|
||||
|
||||
meta = {
|
||||
# Add default meta information
|
||||
|
|
|
@ -824,10 +824,10 @@ self: super: {
|
|||
# https://github.com/ivanperez-keera/hcwiid/pull/4
|
||||
hcwiid = overrideCabal super.hcwiid (drv: {
|
||||
configureFlags = (drv.configureFlags or []) ++ [
|
||||
"--extra-lib-dirs=${pkgs.bluez}/lib"
|
||||
"--extra-lib-dirs=${pkgs.bluez.out}/lib"
|
||||
"--extra-lib-dirs=${pkgs.cwiid}/lib"
|
||||
"--extra-include-dirs=${pkgs.cwiid}/include"
|
||||
"--extra-include-dirs=${pkgs.bluez}/include"
|
||||
"--extra-include-dirs=${pkgs.bluez.dev}/include"
|
||||
];
|
||||
prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
|
||||
});
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
sed -e s@/bin/pwd@pwd@g -i otp_build
|
||||
'';
|
||||
|
||||
configureFlags = "--with-ssl=${openssl}";
|
||||
configureFlags = "--with-ssl=${openssl.dev}";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
@ -108,12 +108,12 @@ let
|
|||
|
||||
mysql = {
|
||||
configureFlags = ["--with-mysql"];
|
||||
buildInputs = [ mysql.lib ];
|
||||
buildInputs = [ mysql.lib.dev ];
|
||||
};
|
||||
|
||||
mysqli = {
|
||||
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
|
||||
buildInputs = [ mysql.lib ];
|
||||
configureFlags = ["--with-mysqli=${mysql.lib.dev}/bin/mysql_config"];
|
||||
buildInputs = [ mysql.lib.dev ];
|
||||
};
|
||||
|
||||
mysqli_embedded = {
|
||||
|
@ -123,8 +123,8 @@ let
|
|||
};
|
||||
|
||||
pdo_mysql = {
|
||||
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
|
||||
buildInputs = [ mysql.lib ];
|
||||
configureFlags = ["--with-pdo-mysql=${mysql.lib.dev}"];
|
||||
buildInputs = [ mysql.lib.dev ];
|
||||
};
|
||||
|
||||
bcmath = {
|
||||
|
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation {
|
|||
export MACOSX_DEPLOYMENT_TARGET=10.6
|
||||
''}
|
||||
|
||||
substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc}/include
|
||||
substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc.dev}/include
|
||||
|
||||
configureFlagsArray=( --enable-shared --with-threads
|
||||
CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
|
||||
|
|
|
@ -156,7 +156,7 @@ let
|
|||
baseRuby = baseruby;
|
||||
libPath = "lib/${rubyEngine}/${versionNoPatch}";
|
||||
gemPath = "lib/${rubyEngine}/gems/${versionNoPatch}";
|
||||
dev = import ./dev.nix {
|
||||
devEnv = import ./dev.nix {
|
||||
inherit buildEnv bundler bundix;
|
||||
ruby = self;
|
||||
};
|
||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "lib" ];
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
propagatedBuildInputs = [ nspr ];
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "lib" ];
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
propagatedBuildInputs = [ nspr ];
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev"; # sdl-config
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" "doc" ];
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
setOutputFlags = false; # Doesn't support all the flags
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" "doc" ];
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
buildInputs = [ attr ];
|
||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
sh autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib";
|
||||
configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib";
|
||||
|
||||
meta = {
|
||||
description = "High quality rendering engine for C++";
|
||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
buildInputs = optional stdenv.isFreeBSD autoreconfHook;
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
preConfigure =
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [
|
||||
python pkgconfig popt intltool dbus_glib
|
||||
|
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = libintlOrEmpty;
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "bin" "doc" ];
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null;
|
||||
|
||||
outputs = [ "dev" "out" "doc" ];
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-cplusplus" ]
|
||||
|
|
|
@ -162,7 +162,7 @@ stdenv.mkDerivation {
|
|||
|
||||
postFixup = fixup;
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false;
|
||||
|
||||
crossAttrs = rec {
|
||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
|
||||
'';
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
outputBin = "dev"; # very small
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "bin" "out" "man" "docdev" ];
|
||||
outputs = [ "bin" "dev" "out" "man" "docdev" ];
|
||||
|
||||
buildInputs =
|
||||
[ openssl db gettext kerberos ]
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext ];
|
||||
|
|
|
@ -32,7 +32,7 @@ self = stdenv.mkDerivation {
|
|||
--replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
|
||||
'';
|
||||
|
||||
outputs = [ "dev" "out" "lib" "doc" ];
|
||||
outputs = [ "out" "dev" "lib" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ expat ];
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
|
||||
buildInputs = [ mesa libX11 ];
|
||||
|
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
postPatch = "patchShebangs ./src/svn_version.sh";
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
propagatedBuildInputs = [ zlib expat ];
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ]; # TODO: fix referrers
|
||||
outputs = [ "out" "dev" ]; # TODO: fix referrers
|
||||
outputBin = "dev";
|
||||
|
||||
configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
|
||||
|
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''patchShebangs .'';
|
||||
inherit patches;
|
||||
|
||||
outputs = [ "dev" "out" "bin" ]
|
||||
outputs = [ "bin" "dev" "out" ]
|
||||
++ optional (reqMin "1.0") "doc" ; # just dev-doc
|
||||
setOutputFlags = false; # doesn't accept all and stores configureFlags in libs!
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
|
||||
outputs = [ "out" "dev" "doc" ]; # it's dev-doc only
|
||||
outputBin = "dev"; # fftw-wisdom
|
||||
|
||||
configureFlags =
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
}
|
||||
;
|
||||
|
||||
outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config
|
||||
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
|
||||
|
||||
propagatedBuildInputs = [ freetype ];
|
||||
buildInputs = [ pkgconfig expat ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
|
||||
, substituteAll }:
|
||||
|
||||
/** Font configuration scheme
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config
|
||||
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
|
||||
|
||||
propagatedBuildInputs = [ freetype ];
|
||||
buildInputs = [ pkgconfig expat ];
|
||||
|
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
|
||||
"--disable-docs"
|
||||
# just ~1MB; this is what you get when loading config fails for some reason
|
||||
"--with-default-fonts=${fontbhttf}"
|
||||
# just <1MB; this is what you get when loading config fails for some reason
|
||||
"--with-default-fonts=${dejavu_fonts.minimal}"
|
||||
];
|
||||
|
||||
# We should find a better way to access the arch reliably.
|
||||
|
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
cd "$out/etc/fonts"
|
||||
"${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \
|
||||
"${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \
|
||||
--stringparam fontconfigConfigVersion "${configVersion}" \
|
||||
--path $out/share/xml/fontconfig \
|
||||
${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }:
|
||||
{ runCommand, lib, writeText, fontconfig, fontDirectories }:
|
||||
|
||||
runCommand "fc-cache"
|
||||
rec {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }:
|
||||
{ runCommand, libxslt, fontconfig, dejavu_fonts, fontDirectories }:
|
||||
|
||||
runCommand "fonts.conf"
|
||||
{
|
||||
buildInputs = [ libxslt fontconfig ];
|
||||
# Add a default font for non-nixos systems. fontbhttf is only about 1mb.
|
||||
fontDirectories = fontDirectories ++ [ fontbhttf ];
|
||||
# Add a default font for non-nixos systems, <1MB and in nixos defaults.
|
||||
fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
|
||||
}
|
||||
''
|
||||
xsltproc --stringparam fontDirectories "$fontDirectories" \
|
||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
stdenv pkgconfig
|
||||
] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
|
||||
] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
|
||||
|
||||
configureFlags = stdenv.lib.optional enableX11 "--with-x11";
|
||||
|
||||
|
@ -21,4 +21,4 @@ stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)"
|
||||
'';
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
|
||||
# dependence on harfbuzz is looser than the reverse dependence
|
||||
|
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ zlib fontconfig freetype ];
|
||||
propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ];
|
||||
|
||||
outputs = [ "dev" "out" "bin" ];
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
postFixup = ''moveToOutput "bin/gdlib-config" $dev'';
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
|||
"--with-libz=${zlib.dev}" # optional
|
||||
|
||||
"--with-pg=${postgresql}/bin/pg_config"
|
||||
"--with-mysql=${mysql.lib}/bin/mysql_config"
|
||||
"--with-mysql=${mysql.lib.dev}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff}"
|
||||
"--with-python" # optional
|
||||
"--with-static-proj4=${proj}" # optional
|
||||
|
|
|
@ -32,7 +32,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
|
|||
"--with-libz=${zlib.dev}" # optional
|
||||
|
||||
"--with-pg=${postgresql}/bin/pg_config"
|
||||
"--with-mysql=${mysql.lib}/bin/mysql_config"
|
||||
"--with-mysql=${mysql.lib.dev}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff}"
|
||||
"--with-python" # optional
|
||||
"--with-static-proj4=${proj}" # optional
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs
|
||||
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
|
||||
|
||||
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
|
||||
|
||||
outputs = [ "dev" "out" "docdev" ];
|
||||
outputs = [ "out" "dev" "docdev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
|
|
@ -110,7 +110,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
installFlags = [ "sysconfdir=$(out)/etc" ];
|
||||
|
||||
outputs = [ "dev" "out" "bin" "static" ];
|
||||
outputs = [ "out" "bin" "dev" "static" ];
|
||||
|
||||
buildInputs = lib.optionals (cross != null) [ gccCross ]
|
||||
++ lib.optionals withGd [ gd libpng ];
|
||||
|
|
|
@ -6,7 +6,7 @@ let
|
|||
glibc64 = glibc;
|
||||
in
|
||||
runCommand "${nameVersion.name}-multi-${nameVersion.version}"
|
||||
{ outputs = [ "dev" "out" "bin" ]; } # TODO: no static version here (yet)
|
||||
{ outputs = [ "bin" "dev" "out"]; } # TODO: no static version here (yet)
|
||||
''
|
||||
mkdir -p "$out/lib"
|
||||
ln -s '${glibc64.out}'/lib/* "$out/lib"
|
||||
|
@ -22,7 +22,7 @@ runCommand "${nameVersion.name}-multi-${nameVersion.version}"
|
|||
chmod +x "$bin/bin/ldd"
|
||||
|
||||
mkdir "$dev"
|
||||
cp -rs '${glibc32}'/include "$dev/"
|
||||
cp -rs '${glibc32.dev}'/include "$dev/"
|
||||
chmod +w -R "$dev"
|
||||
cp -rsf '${glibc64}'/include "$dev/"
|
||||
cp -rsf '${glibc64.dev}'/include "$dev/"
|
||||
''
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1pvw2mrm03p51p03179rb6fk9p42iykkwj1jcdv7jr265xymy8nw";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gnum4 ];
|
||||
propagatedBuildInputs = [ glib libsigcxx ];
|
||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ glib zlib libgpgerror ];
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, m4, cxx ? true }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let self = stdenv.mkDerivation rec {
|
||||
name = "gmp-4.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck";
|
||||
};
|
||||
|
||||
#outputs TODO: split $cxx due to libstdc++ dependency
|
||||
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
|
||||
# - see #5855 for related discussion
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
passthru.static = self.out;
|
||||
|
||||
nativeBuildInputs = [ m4 ];
|
||||
|
||||
# Prevent the build system from using sub-architecture-specific
|
||||
|
@ -60,4 +66,5 @@ stdenv.mkDerivation rec {
|
|||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
};
|
||||
in self
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
with { inherit (stdenv.lib) optional optionalString; };
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let self = stdenv.mkDerivation rec {
|
||||
name = "gmp-5.1.3";
|
||||
|
||||
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
|
||||
|
@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m";
|
||||
};
|
||||
|
||||
outputs = [ "out" "info" ];
|
||||
#outputs TODO: split $cxx due to libstdc++ dependency
|
||||
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
|
||||
# - see #5855 for related discussion
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
passthru.static = self.out;
|
||||
|
||||
nativeBuildInputs = [ m4 ];
|
||||
|
||||
|
@ -76,4 +80,5 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
};
|
||||
in self
|
||||
|
|
|
@ -10,10 +10,10 @@ let self = stdenv.mkDerivation rec {
|
|||
sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458";
|
||||
};
|
||||
|
||||
#outputs TODO: split $cxx due to libstdc++ dependency; maybe port to gmp5;
|
||||
#outputs TODO: split $cxx due to libstdc++ dependency
|
||||
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
|
||||
# - see #5855 for related discussion
|
||||
outputs = [ "dev" "out" "info" ];
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
passthru.static = self.out;
|
||||
|
||||
nativeBuildInputs = [ m4 ];
|
||||
|
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
|||
|
||||
inherit src patches;
|
||||
|
||||
outputs = [ "dev" "out" "bin" "man" "docdev" ];
|
||||
outputs = [ "bin" "dev" "out" "man" "docdev" ];
|
||||
outputInfo = "docdev";
|
||||
|
||||
postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
|
||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
outputMan = "dev"; # tiny pages
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" "info" ];
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
|
||||
|
||||
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
|
||||
|
|
|
@ -4,13 +4,14 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "grail-${version}";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
|
||||
sha256 = "c26dced1b3f4317ecf6af36db0e90294d87e43966d56aecc4e97b65368ab78b9";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig python3 frame ]
|
||||
++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
|
||||
++ stdenv.lib.optionals enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
|
||||
|
||||
configureFlags = stdenv.lib.optional enableX11 "--with-x11";
|
||||
|
||||
|
@ -20,4 +21,4 @@ stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97";
|
||||
};
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue