misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed

Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
This commit is contained in:
John Ericson 2017-09-05 18:03:42 -04:00
parent 531e4b80c9
commit f8a18cd4cf
29 changed files with 312 additions and 293 deletions

View file

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ pkgconfig qmake ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib qtbase qtscript ]; buildInputs = [ alsaLib qtbase qtscript ];
qmakeFlags = [ "PREFIX=/" ]; qmakeFlags = [ "PREFIX=/" ];

View file

@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig perl ]
buildInputs = [ ncurses boehmgc ];
nativeBuildInputs = [ perl ]
# `help2man' wants to run Zile, which won't work when the # `help2man' wants to run Zile, which won't work when the
# newly-produced binary can't be run at build-time. # newly-produced binary can't be run at build-time.
++ stdenv.lib.optional ++ stdenv.lib.optional
(stdenv.hostPlatform == stdenv.buildPlatform) (stdenv.hostPlatform == stdenv.buildPlatform)
help2man; help2man;
buildInputs = [ ncurses boehmgc ];
# Tests can't be run because most of them rely on the ability to # Tests can't be run because most of them rely on the ability to
# fiddle with the terminal. # fiddle with the terminal.
doCheck = false; doCheck = false;

View file

@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool makeWrapper buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt
gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
nativeBuildInputs = [ libxslt ];
configureFlags = "--enable-call"; configureFlags = "--enable-call";
preFixup = '' preFixup = ''

View file

@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ pkgconfig qmake ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ qtbase qtsvg boost qwt6 ]; buildInputs = [ qtbase qtsvg boost qwt6 ];
patches = [ ./0001-unbundled-qwt.patch ]; patches = [ ./0001-unbundled-qwt.patch ];

View file

@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file
webkitgtk libsoup libsecret gnome_desktop libnotify libtool webkitgtk libsoup libsecret gnome_desktop libnotify libtool
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools

View file

@ -47,10 +47,9 @@ in stdenv.mkDerivation ({
inherit src version; inherit src version;
nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ];
nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses openssl ]
buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ]
++ optionals wxSupport wxPackages2 ++ optionals wxSupport wxPackages2
++ optionals odbcSupport odbcPackages ++ optionals odbcSupport odbcPackages
++ optionals javacSupport javacPackages ++ optionals javacSupport javacPackages

View file

@ -32,9 +32,8 @@ let
build = {flags, target}: stdenv.mkDerivation rec { build = {flags, target}: stdenv.mkDerivation rec {
name = "pixie-${version}"; name = "pixie-${version}";
version = "0-r${commit-count}-${variant}"; version = "0-r${commit-count}-${variant}";
nativeBuildInputs = libs; nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ]; buildInputs = libs;
buildInputs = [ makeWrapper ];
PYTHON = if buildWithPypy PYTHON = if buildWithPypy
then "${pypy}/pypy-c/.pypy-c-wrapped" then "${pypy}/pypy-c/.pypy-c-wrapped"
else "${python2.interpreter}"; else "${python2.interpreter}";

View file

@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ]; propagatedBuildInputs = [ nspr ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213;
buildInputs = [ perl python2 zip ]; buildInputs = [ perl python2 zip ];
nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else [];
postUnpack = "sourceRoot=\${sourceRoot}/js/src"; postUnpack = "sourceRoot=\${sourceRoot}/js/src";

View file

@ -16,9 +16,8 @@ stdenv.mkDerivation {
inherit (s) url sha256; inherit (s) url sha256;
}; };
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib libjpeg freetype giflib libpng ] buildInputs = [ zlib libjpeg freetype giflib libpng ]
++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optional enableSDL SDL
++ stdenv.lib.optionals enableX11 (with xorg; [ ++ stdenv.lib.optionals enableX11 (with xorg; [

View file

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
}; };
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libosip openssl ]; buildInputs = [ libosip openssl ];

View file

@ -7,9 +7,8 @@ stdenv.mkDerivation rec {
url = "http://linalg.org/fflas-ffpack-${version}.tar.gz"; url = "http://linalg.org/fflas-ffpack-${version}.tar.gz";
sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9"; sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ givaro_3_7 openblas gmpxx]; buildInputs = [ givaro_3_7 openblas gmpxx];
nativeBuildInputs = [pkgconfig];
configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}";
meta = { meta = {
inherit version; inherit version;

View file

@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd"; sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas];
nativeBuildInputs = [pkgconfig];
configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack";
meta = { meta = {
inherit version; inherit version;

View file

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zeromq3 jdk ]; buildInputs = [ zeromq3 jdk ];
preConfigure = '' preConfigure = ''

View file

@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
nativeBuildInputs = [automake autoconf libtool ]; nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost openssl zlib python libiconv geoip ]; buildInputs = [ boost openssl zlib python libiconv geoip ];
preConfigure = "./autotool.sh"; preConfigure = "./autotool.sh";

View file

@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k"; sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
buildInputs = [ mediastreamer openh264 ]; buildInputs = [ mediastreamer openh264 ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "H.264 encoder/decoder plugin for mediastreamer2"; description = "H.264 encoder/decoder plugin for mediastreamer2";

View file

@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ];
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ configureFlags = [
"--without-apxs" "--without-apxs"

View file

@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
name = "vulkan-loader-${version}"; name = "vulkan-loader-${version}";
inherit version src; inherit version src;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake git python3 python3Packages.lxml buildInputs = [ cmake git python3 python3Packages.lxml
glslang spirv-tools x11 libxcb libXrandr libXext wayland glslang spirv-tools x11 libxcb libXrandr libXext wayland
]; ];

View file

@ -30,11 +30,12 @@ buildPythonPackage rec {
tests/run/cpdef_enums.pyx tests/run/cpdef_enums.pyx
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [
pkgconfig
# For testing
numpy ncurses
];
buildInputs = [ glibcLocales gdb ]; buildInputs = [ glibcLocales gdb ];
# For testing
nativeBuildInputs = [ numpy ncurses ];
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
# cython's testsuite is not working very well with libc++ # cython's testsuite is not working very well with libc++
@ -55,4 +56,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fridh ]; maintainers = with lib.maintainers; [ fridh ];
}; };
} }

View file

@ -39,8 +39,10 @@ let
in in
{ {
nativeBuildInputs = [ pkgconfig ]; atk = attrs: {
atk = attrs: { buildInputs = [ gtk2 pcre ]; }; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre ];
};
bundler = attrs: bundler = attrs:
let let
@ -58,7 +60,7 @@ in
}; };
cairo = attrs: { cairo = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
}; };
@ -91,16 +93,20 @@ in
buildInputs = [ gpgme ]; buildInputs = [ gpgme ];
}; };
nativeBuildInputs = [ pkgconfig ]; gio2 = attrs: {
gio2 = attrs: { buildInputs = [ gtk2 pcre ]; }; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre ];
};
gitlab-markup = attrs: { meta.priority = 1; }; gitlab-markup = attrs: { meta.priority = 1; };
nativeBuildInputs = [ pkgconfig ]; glib2 = attrs: {
glib2 = attrs: { buildInputs = [ gtk2 pcre ]; }; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre ];
};
gtk2 = attrs: { gtk2 = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
# CFLAGS must be set for this gem to detect gdkkeysyms.h correctly # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";

View file

@ -23,8 +23,7 @@ stdenv.mkDerivation {
# perf refers both to newt and slang # perf refers both to newt and slang
# binutils is required for libbfd. # binutils is required for libbfd.
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty libaudit makeWrapper ]; flex bison libiberty libaudit makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++ buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++
stdenv.lib.optional withGtk gtk2; stdenv.lib.optional withGtk gtk2;

File diff suppressed because it is too large Load diff

View file

@ -281,7 +281,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
url = $pkgURLs{$pkg}; url = $pkgURLs{$pkg};
sha256 = "$pkgHashes{$pkg}"; sha256 = "$pkgHashes{$pkg}";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ $inputs];$extraAttrs buildInputs = [ $inputs];$extraAttrs
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit $inputs;}; }) // {inherit $inputs;};

View file

@ -71,13 +71,13 @@ in
}; };
libxcb = attrs : attrs // { libxcb = attrs : attrs // {
nativeBuildInputs = [ args.python ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
configureFlags = "--enable-xkb --enable-xinput"; configureFlags = "--enable-xkb --enable-xinput";
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
}; };
xcbproto = attrs : attrs // { xcbproto = attrs : attrs // {
nativeBuildInputs = [ args.python ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
}; };
libX11 = attrs: attrs // { libX11 = attrs: attrs // {
@ -410,7 +410,7 @@ in
url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2;
sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
} else if (args.abiCompat == "1.18") then { } else if (args.abiCompat == "1.18") then {
@ -420,7 +420,7 @@ in
url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
} else throw "unsupported xorg abiCompat: ${args.abiCompat}"; } else throw "unsupported xorg abiCompat: ${args.abiCompat}";
@ -541,7 +541,7 @@ in
}; };
twm = attrs: attrs // { twm = attrs: attrs // {
nativeBuildInputs = [args.bison args.flex]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex];
}; };
xcursorthemes = attrs: attrs // { xcursorthemes = attrs: attrs // {
@ -568,7 +568,7 @@ in
xf86videointel = attrs: attrs // { xf86videointel = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman];
nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros];
configureFlags = "--with-default-dri=3 --enable-tools"; configureFlags = "--with-default-dri=3 --enable-tools";
}; };

View file

@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
}; };
nativeBuildInputs = [ autoreconfHook intltool ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -34,7 +33,8 @@ stdenv.mkDerivation rec {
sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
bash-completion argyllcms libgudev sane-backends ]; bash-completion argyllcms libgudev sane-backends ];

View file

@ -24,8 +24,7 @@ stdenv.mkDerivation {
sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig"; sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
libcap_ng curl nspr nss python ] libcap_ng curl nspr nss python ]
++ optional docs xmlto; ++ optional docs xmlto;

View file

@ -13,9 +13,8 @@ with pkgs; rec {
pythonSupport = false; pythonSupport = false;
}).overrideDerivation }).overrideDerivation
(old: { (old: {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ];
buildInputs = old.buildInputs ++ [ zlib nodejs ]; buildInputs = old.buildInputs ++ [ zlib nodejs ];
nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ];
# just override it with nothing so it does not fail # just override it with nothing so it does not fail
autoreconfPhase = "echo autoreconfPhase not used..."; autoreconfPhase = "echo autoreconfPhase not used...";
checkPhase = '' checkPhase = ''

View file

@ -9895,9 +9895,8 @@ let self = _self // overrides; _self = with self; {
# Build.PL in this package uses which to find pkg-config -- make it use path instead # Build.PL in this package uses which to find pkg-config -- make it use path instead
patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL'';
doCheck = false; # The main test performs network access doCheck = false; # The main test performs network access
nativeBuildInputs = [ pkgs.pkgconfig ];
#buildInputs = [ TestMore TestPod ]; #buildInputs = [ TestMore TestPod ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pkgs. ];
propagatedBuildInputs = [ pkgs.libdiscid ]; propagatedBuildInputs = [ pkgs.libdiscid ];
}; };
@ -12787,8 +12786,8 @@ let self = _self // overrides; _self = with self; {
sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4"; sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4";
}; };
propagatedBuildInputs = [XMLXPath]; propagatedBuildInputs = [XMLXPath];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs. pkgs.libvirt]; buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.libvirt];
meta = { meta = {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };

View file

@ -91,7 +91,7 @@ let
"--with-libmemcached-dir=${pkgs.libmemcached}" "--with-libmemcached-dir=${pkgs.libmemcached}"
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [ cyrus_sasl zlib ]; buildInputs = with pkgs; [ cyrus_sasl zlib ];
}; };
@ -110,7 +110,7 @@ let
"--with-libmemcached-dir=${pkgs.libmemcached}" "--with-libmemcached-dir=${pkgs.libmemcached}"
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [ cyrus_sasl zlib ]; buildInputs = with pkgs; [ cyrus_sasl zlib ];
}; };
@ -164,9 +164,7 @@ let
"--with-yaml=${pkgs.libyaml}" "--with-yaml=${pkgs.libyaml}"
]; ];
buildInputs = [ nativeBuildInputs = [ pkgs.pkgconfig ];
pkgs.pkgconfig
];
}; };
yaml20 = assert isPhp7; buildPecl { yaml20 = assert isPhp7; buildPecl {
@ -178,9 +176,7 @@ let
"--with-yaml=${pkgs.libyaml}" "--with-yaml=${pkgs.libyaml}"
]; ];
buildInputs = [ nativeBuildInputs = [ pkgs.pkgconfig ];
pkgs.pkgconfig
];
}; };
# Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation. # Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation.
@ -199,8 +195,7 @@ let
"--with-zmq=${pkgs.zeromq}" "--with-zmq=${pkgs.zeromq}"
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs. ];
}; };
# No support for PHP 7 and probably never will be # No support for PHP 7 and probably never will be

View file

@ -7166,8 +7166,8 @@ in {
}; };
NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs. pkgs.poppler.dev ]; buildInputs = [ pkgs.poppler.dev ];
propagatedBuildInputs = with self; [ pycairo pygobject2 ]; propagatedBuildInputs = with self; [ pycairo pygobject2 ];
patches = [ patches = [
@ -9448,8 +9448,8 @@ in {
sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ pkgs. pkgs.fuse ]; buildInputs = with self; [ pkgs.fuse ];
meta = { meta = {
description = "Python bindings for FUSE"; description = "Python bindings for FUSE";
@ -11193,8 +11193,8 @@ in {
sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ pytest pkgs. pkgs.fuse pkgs.attr pkgs.which ]; buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ];
propagatedBuildInputs = with self; [ contextlib2 ]; propagatedBuildInputs = with self; [ contextlib2 ];
@ -13138,8 +13138,8 @@ in {
configure configure
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ python pkgs. pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
@ -16424,8 +16424,8 @@ in {
patchShebangs . patchShebangs .
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ self.setuptools self.nose pkgs. pkgs.swig pkgs.libcdio ] buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ]
++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ];
@ -17125,8 +17125,7 @@ in {
PATH="${pkgs.parted}/sbin:$PATH" PATH="${pkgs.parted}/sbin:$PATH"
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ pkgs. ];
propagatedBuildInputs = with self; [ pkgs.parted ]; propagatedBuildInputs = with self; [ pkgs.parted ];
@ -20290,8 +20289,8 @@ in {
sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl"; sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs. self.pytest_28 self.pytestrunner ]; buildInputs = [ self.pytest_28 self.pytestrunner ];
propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ]; propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ];
# Tests are not included in archive # Tests are not included in archive
@ -20373,9 +20372,9 @@ in {
sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4";
}; };
propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; nativeBuildInputs = [ pkgs.pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ];
propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ];
}; };
@ -20964,8 +20963,8 @@ in {
src = pkgs.subunit.src; src = pkgs.subunit.src;
propagatedBuildInputs = with self; [ testtools testscenarios ]; propagatedBuildInputs = with self; [ testtools testscenarios ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs. pkgs.check pkgs.cppunit ]; buildInputs = [ pkgs.check pkgs.cppunit ];
patchPhase = '' patchPhase = ''
sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py
@ -24109,8 +24108,8 @@ EOF
sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ python pkgs. pkgs.libvirt lxml ]; buildInputs = with self; [ python pkgs.libvirt lxml ];
buildPhase = "${python.interpreter} setup.py build"; buildPhase = "${python.interpreter} setup.py build";
@ -24249,8 +24248,8 @@ EOF
preBuild = "${python}/bin/${python.executable} setup.py build_ext"; preBuild = "${python}/bin/${python.executable} setup.py build_ext";
installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ pkgs. pkgs.enlightenment.efl ]; buildInputs = with self; [ pkgs.enlightenment.efl ];
doCheck = false; doCheck = false;
meta = { meta = {