Merge pull request #172250 from Artturin/ridofnulls
remove some useless null asserts
This commit is contained in:
commit
6d007b2ce4
|
@ -6,56 +6,35 @@
|
|||
, pkg-config
|
||||
, jansson
|
||||
# deadbeef can use either gtk2 or gtk3
|
||||
, gtk2Support ? false, gtk2 ? null
|
||||
, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
|
||||
, gtk2Support ? false, gtk2
|
||||
, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook
|
||||
# input plugins
|
||||
, vorbisSupport ? true, libvorbis ? null
|
||||
, mp123Support ? true, libmad ? null
|
||||
, flacSupport ? true, flac ? null
|
||||
, wavSupport ? true, libsndfile ? null
|
||||
, cdaSupport ? true, libcdio ? null, libcddb ? null
|
||||
, aacSupport ? true, faad2 ? null
|
||||
, opusSupport ? true, opusfile ? null
|
||||
, wavpackSupport ? false, wavpack ? null
|
||||
, ffmpegSupport ? false, ffmpeg ? null
|
||||
, apeSupport ? true, yasm ? null
|
||||
, vorbisSupport ? true, libvorbis
|
||||
, mp123Support ? true, libmad
|
||||
, flacSupport ? true, flac
|
||||
, wavSupport ? true, libsndfile
|
||||
, cdaSupport ? true, libcdio, libcddb
|
||||
, aacSupport ? true, faad2
|
||||
, opusSupport ? true, opusfile
|
||||
, wavpackSupport ? false, wavpack
|
||||
, ffmpegSupport ? false, ffmpeg
|
||||
, apeSupport ? true, yasm
|
||||
# misc plugins
|
||||
, zipSupport ? true, libzip ? null
|
||||
, artworkSupport ? true, imlib2 ? null
|
||||
, hotkeysSupport ? true, libX11 ? null
|
||||
, osdSupport ? true, dbus ? null
|
||||
, zipSupport ? true, libzip
|
||||
, artworkSupport ? true, imlib2
|
||||
, hotkeysSupport ? true, libX11
|
||||
, osdSupport ? true, dbus
|
||||
# output plugins
|
||||
, alsaSupport ? true, alsa-lib ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, alsaSupport ? true, alsa-lib
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
|
||||
# effect plugins
|
||||
, resamplerSupport ? true, libsamplerate ? null
|
||||
, overloadSupport ? true, zlib ? null
|
||||
, resamplerSupport ? true, libsamplerate
|
||||
, overloadSupport ? true, zlib
|
||||
# transports
|
||||
, remoteSupport ? true, curl ? null
|
||||
, remoteSupport ? true, curl
|
||||
}:
|
||||
|
||||
assert gtk2Support || gtk3Support;
|
||||
assert gtk2Support -> gtk2 != null;
|
||||
assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null;
|
||||
assert vorbisSupport -> libvorbis != null;
|
||||
assert mp123Support -> libmad != null;
|
||||
assert flacSupport -> flac != null;
|
||||
assert wavSupport -> libsndfile != null;
|
||||
assert cdaSupport -> (libcdio != null && libcddb != null);
|
||||
assert aacSupport -> faad2 != null;
|
||||
assert opusSupport -> opusfile != null;
|
||||
assert zipSupport -> libzip != null;
|
||||
assert ffmpegSupport -> ffmpeg != null;
|
||||
assert apeSupport -> yasm != null;
|
||||
assert artworkSupport -> imlib2 != null;
|
||||
assert hotkeysSupport -> libX11 != null;
|
||||
assert osdSupport -> dbus != null;
|
||||
assert alsaSupport -> alsa-lib != null;
|
||||
assert pulseSupport -> libpulseaudio != null;
|
||||
assert resamplerSupport -> libsamplerate != null;
|
||||
assert overloadSupport -> zlib != null;
|
||||
assert wavpackSupport -> wavpack != null;
|
||||
assert remoteSupport -> curl != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef";
|
||||
|
|
|
@ -1,29 +1,17 @@
|
|||
{ lib, bundlerApp, bundlerUpdateScript, makeWrapper,
|
||||
withPngcrush ? true, pngcrush ? null,
|
||||
withPngout ? true, pngout ? null,
|
||||
withAdvpng ? true, advancecomp ? null,
|
||||
withOptipng ? true, optipng ? null,
|
||||
withPngquant ? true, pngquant ? null,
|
||||
withJhead ? true, jhead ? null,
|
||||
withJpegoptim ? true, jpegoptim ? null,
|
||||
withJpegrecompress ? true, jpeg-archive ? null,
|
||||
withJpegtran ? true, libjpeg ? null,
|
||||
withGifsicle ? true, gifsicle ? null,
|
||||
withSvgo ? true, svgo ? null
|
||||
withPngcrush ? true, pngcrush,
|
||||
withPngout ? true, pngout,
|
||||
withAdvpng ? true, advancecomp,
|
||||
withOptipng ? true, optipng,
|
||||
withPngquant ? true, pngquant,
|
||||
withJhead ? true, jhead,
|
||||
withJpegoptim ? true, jpegoptim,
|
||||
withJpegrecompress ? true, jpeg-archive,
|
||||
withJpegtran ? true, libjpeg,
|
||||
withGifsicle ? true, gifsicle,
|
||||
withSvgo ? true, svgo
|
||||
}:
|
||||
|
||||
assert withPngcrush -> pngcrush != null;
|
||||
assert withPngout -> pngout != null;
|
||||
assert withAdvpng -> advancecomp != null;
|
||||
assert withOptipng -> optipng != null;
|
||||
assert withPngquant -> pngquant != null;
|
||||
assert withJhead -> jhead != null;
|
||||
assert withJpegoptim -> jpegoptim != null;
|
||||
assert withJpegrecompress -> jpeg-archive != null;
|
||||
assert withJpegtran -> libjpeg != null;
|
||||
assert withGifsicle -> gifsicle != null;
|
||||
assert withSvgo -> svgo != null;
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
|
|
@ -18,21 +18,14 @@
|
|||
, pkg-config
|
||||
, readline
|
||||
, sqlite
|
||||
, autoAwaySupport ? true, libXScrnSaver ? null, libX11
|
||||
, autoAwaySupport ? true, libXScrnSaver, libX11
|
||||
, notifySupport ? true, libnotify, gdk-pixbuf
|
||||
, omemoSupport ? true, libsignal-protocol-c, libgcrypt
|
||||
, pgpSupport ? true, gpgme
|
||||
, pythonPluginSupport ? true, python
|
||||
, traySupport ? true, gtk
|
||||
, pythonPluginSupport ? true, python3
|
||||
, traySupport ? true, gtk3
|
||||
}:
|
||||
|
||||
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
|
||||
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
|
||||
assert traySupport -> gtk != null;
|
||||
assert pgpSupport -> gpgme != null;
|
||||
assert pythonPluginSupport -> python != null;
|
||||
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profanity";
|
||||
version = "0.12.0";
|
||||
|
@ -75,8 +68,8 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals notifySupport [ libnotify gdk-pixbuf ]
|
||||
++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ]
|
||||
++ lib.optionals pgpSupport [ gpgme ]
|
||||
++ lib.optionals pythonPluginSupport [ python ]
|
||||
++ lib.optionals traySupport [ gtk ];
|
||||
++ lib.optionals pythonPluginSupport [ python3 ]
|
||||
++ lib.optionals traySupport [ gtk3 ];
|
||||
|
||||
# Enable feature flags, so that build fail if libs are missing
|
||||
configureFlags = [
|
||||
|
|
|
@ -1,36 +1,22 @@
|
|||
{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file,
|
||||
pythonSupport ? false, pythonPackages ? null,
|
||||
gnome2 ? null,
|
||||
openexrSupport ? true, openexr ? null,
|
||||
libzipSupport ? true, libzip ? null,
|
||||
libxml2Support ? true, libxml2 ? null,
|
||||
libwebpSupport ? true, libwebp ? null,
|
||||
pythonSupport ? false, python2Packages,
|
||||
gnome2,
|
||||
openexrSupport ? true, openexr,
|
||||
libzipSupport ? true, libzip,
|
||||
libxml2Support ? true, libxml2,
|
||||
libwebpSupport ? true, libwebp,
|
||||
# libXmu is not used if libunique is.
|
||||
libXmuSupport ? false, xorg ? null,
|
||||
libxsltSupport ? true, libxslt ? null,
|
||||
fitsSupport ? true, cfitsio ? null,
|
||||
zlibSupport ? true, zlib ? null,
|
||||
libuniqueSupport ? true, libunique ? null,
|
||||
libpngSupport ? true, libpng ? null,
|
||||
libXmuSupport ? false, xorg,
|
||||
libxsltSupport ? true, libxslt,
|
||||
fitsSupport ? true, cfitsio,
|
||||
zlibSupport ? true, zlib,
|
||||
libuniqueSupport ? true, libunique,
|
||||
libpngSupport ? true, libpng,
|
||||
openglSupport ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
assert openexrSupport -> openexr != null;
|
||||
assert libzipSupport -> libzip != null;
|
||||
assert libxml2Support -> libxml2 != null;
|
||||
assert libwebpSupport -> libwebp != null;
|
||||
assert libXmuSupport -> xorg != null;
|
||||
assert libxsltSupport -> libxslt != null;
|
||||
assert fitsSupport -> cfitsio != null;
|
||||
assert zlibSupport -> zlib != null;
|
||||
assert libuniqueSupport -> libunique != null;
|
||||
assert libpngSupport -> libpng != null;
|
||||
assert openglSupport -> gnome2 != null;
|
||||
assert pythonSupport -> (pythonPackages != null && gnome2 != null);
|
||||
|
||||
let
|
||||
inherit (pythonPackages) pygtk pygobject2 python;
|
||||
|
||||
inherit (python2Packages) pygtk pygobject2 python;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -1,60 +1,37 @@
|
|||
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
|
||||
, aalibSupport ? true, aalib ? null
|
||||
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
|
||||
, fribidiSupport ? true, fribidi ? null
|
||||
, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null
|
||||
, xineramaSupport ? true, libXinerama ? null
|
||||
, xvSupport ? true, libXv ? null
|
||||
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
|
||||
, screenSaverSupport ? true, libXScrnSaver ? null
|
||||
, vdpauSupport ? false, libvdpau ? null
|
||||
, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
|
||||
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null
|
||||
, dvdreadSupport ? true, libdvdread ? null
|
||||
, bluraySupport ? true, libbluray ? null
|
||||
, amrSupport ? false, amrnb ? null, amrwb ? null
|
||||
, cacaSupport ? true, libcaca ? null
|
||||
, lameSupport ? true, lame ? null
|
||||
, speexSupport ? true, speex ? null
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
, x264Support ? false, x264 ? null
|
||||
, jackaudioSupport ? false, libjack2 ? null
|
||||
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
|
||||
, bs2bSupport ? false, libbs2b ? null
|
||||
, v4lSupport ? false, libv4l ? null
|
||||
, aalibSupport ? true, aalib
|
||||
, fontconfigSupport ? true, fontconfig, freefont_ttf
|
||||
, fribidiSupport ? true, fribidi
|
||||
, x11Support ? true, libX11, libXext, libGLU, libGL
|
||||
, xineramaSupport ? true, libXinerama
|
||||
, xvSupport ? true, libXv
|
||||
, alsaSupport ? stdenv.isLinux, alsa-lib
|
||||
, screenSaverSupport ? true, libXScrnSaver
|
||||
, vdpauSupport ? false, libvdpau
|
||||
, cddaSupport ? !stdenv.isDarwin, cdparanoia
|
||||
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav
|
||||
, dvdreadSupport ? true, libdvdread
|
||||
, bluraySupport ? true, libbluray
|
||||
, amrSupport ? false, amrnb, amrwb
|
||||
, cacaSupport ? true, libcaca
|
||||
, lameSupport ? true, lame
|
||||
, speexSupport ? true, speex
|
||||
, theoraSupport ? true, libtheora
|
||||
, x264Support ? false, x264
|
||||
, jackaudioSupport ? false, libjack2
|
||||
, pulseSupport ? config.pulseaudio or false, libpulseaudio
|
||||
, bs2bSupport ? false, libbs2b
|
||||
, v4lSupport ? false, libv4l
|
||||
# For screenshots
|
||||
, libpngSupport ? true, libpng ? null
|
||||
, libjpegSupport ? true, libjpeg ? null
|
||||
, libpngSupport ? true, libpng
|
||||
, libjpegSupport ? true, libjpeg
|
||||
, useUnfreeCodecs ? false
|
||||
, darwin ? null
|
||||
, darwin
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
assert fontconfigSupport -> (fontconfig != null);
|
||||
assert (!fontconfigSupport) -> (freefont_ttf != null);
|
||||
assert fribidiSupport -> (fribidi != null);
|
||||
assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null);
|
||||
assert xineramaSupport -> (libXinerama != null && x11Support);
|
||||
assert xvSupport -> (libXv != null && x11Support);
|
||||
assert alsaSupport -> alsa-lib != null;
|
||||
assert screenSaverSupport -> libXScrnSaver != null;
|
||||
assert vdpauSupport -> libvdpau != null;
|
||||
assert cddaSupport -> cdparanoia != null;
|
||||
assert dvdnavSupport -> libdvdnav != null;
|
||||
assert dvdreadSupport -> libdvdread != null;
|
||||
assert bluraySupport -> libbluray != null;
|
||||
assert amrSupport -> (amrnb != null && amrwb != null);
|
||||
assert cacaSupport -> libcaca != null;
|
||||
assert lameSupport -> lame != null;
|
||||
assert speexSupport -> speex != null;
|
||||
assert theoraSupport -> libtheora != null;
|
||||
assert x264Support -> x264 != null;
|
||||
assert jackaudioSupport -> libjack2 != null;
|
||||
assert pulseSupport -> libpulseaudio != null;
|
||||
assert bs2bSupport -> libbs2b != null;
|
||||
assert libpngSupport -> libpng != null;
|
||||
assert libjpegSupport -> libjpeg != null;
|
||||
assert v4lSupport -> libv4l != null;
|
||||
assert xineramaSupport -> x11Support;
|
||||
assert xvSupport -> x11Support;
|
||||
|
||||
let
|
||||
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
|
||||
, audit, glib, libusb1, libxml2
|
||||
, wrapGAppsHook
|
||||
, gstreamer ? null
|
||||
, gst-plugins-base ? null
|
||||
, gst-plugins-good ? null
|
||||
, gst-plugins-bad ? null
|
||||
, libnotify ? null
|
||||
, gnome ? null
|
||||
, gtk3 ? null
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-plugins-bad
|
||||
, libnotify
|
||||
, gnome
|
||||
, gtk3
|
||||
, enableUsb ? true
|
||||
, enablePacketSocket ? true
|
||||
, enableViewer ? true
|
||||
|
@ -23,11 +23,7 @@ let
|
|||
(pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
|
||||
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
|
||||
in
|
||||
assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
|
||||
assert enableViewer -> enableGstPlugin;
|
||||
assert enableViewer -> libnotify != null;
|
||||
assert enableViewer -> gnome != null;
|
||||
assert enableViewer -> gtk3 != null;
|
||||
assert enableViewer -> gstreamerAtLeastVersion1;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -87,4 +83,3 @@ in
|
|||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -1,13 +1,9 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, zlibSupport ? true, zlib ? null
|
||||
, sslSupport ? true, openssl ? null
|
||||
, idnSupport ? true, libidn ? null
|
||||
, zlibSupport ? true, zlib
|
||||
, sslSupport ? true, openssl
|
||||
, idnSupport ? true, libidn
|
||||
}:
|
||||
|
||||
assert zlibSupport -> zlib != null;
|
||||
assert sslSupport -> openssl != null;
|
||||
assert idnSupport -> libidn != null;
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
|
|
|
@ -1,21 +1,16 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, nasmSupport ? true, nasm ? null # Assembly optimizations
|
||||
, nasmSupport ? true, nasm # Assembly optimizations
|
||||
, cpmlSupport ? true # Compaq's fast math library
|
||||
#, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging
|
||||
, sndfileFileIOSupport ? false, libsndfile ? null # Use libsndfile, instead of lame's internal routines
|
||||
#, efenceSupport ? false, libefence # Use ElectricFence for malloc debugging
|
||||
, sndfileFileIOSupport ? false, libsndfile # Use libsndfile, instead of lame's internal routines
|
||||
, analyzerHooksSupport ? true # Use analyzer hooks
|
||||
, decoderSupport ? true # mpg123 decoder
|
||||
, frontendSupport ? true # Build the lame executable
|
||||
#, mp3xSupport ? false, gtk1 ? null # Build GTK frame analyzer
|
||||
#, mp3xSupport ? false, gtk1 # Build GTK frame analyzer
|
||||
, mp3rtpSupport ? false # Build mp3rtp
|
||||
, debugSupport ? false # Debugging (disables optimizations)
|
||||
}:
|
||||
|
||||
assert nasmSupport -> (nasm != null);
|
||||
#assert efenceSupport -> (libefence != null);
|
||||
assert sndfileFileIOSupport -> (libsndfile != null);
|
||||
#assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null));
|
||||
|
||||
let
|
||||
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
|
||||
in
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
|
||||
, withJava ? false, jdk ? null, ant ? null
|
||||
, withAACS ? false, libaacs ? null
|
||||
, withBDplus ? false, libbdplus ? null
|
||||
, withMetadata ? true, libxml2 ? null
|
||||
, withFonts ? true, freetype ? null
|
||||
, withJava ? false, jdk, ant
|
||||
, withAACS ? false, libaacs
|
||||
, withBDplus ? false, libbdplus
|
||||
, withMetadata ? true, libxml2
|
||||
, withFonts ? true, freetype
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert withJava -> jdk != null && ant != null;
|
||||
assert withAACS -> libaacs != null;
|
||||
assert withBDplus -> libbdplus != null;
|
||||
assert withMetadata -> libxml2 != null;
|
||||
assert withFonts -> freetype != null;
|
||||
|
||||
# Info on how to use:
|
||||
# https://wiki.archlinux.org/index.php/BluRay
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool
|
||||
, threadingSupport ? true # multi-threading
|
||||
, openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
|
||||
, pngSupport ? true, libpng ? null # PNG image format
|
||||
, jpegSupport ? true, libjpeg ? null # JPEG image format
|
||||
, tiffSupport ? true, libtiff ? null # TIFF image format
|
||||
, gifSupport ? true, giflib ? null # GIF image format
|
||||
, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp)
|
||||
, pngSupport ? true, libpng # PNG image format
|
||||
, jpegSupport ? true, libjpeg # JPEG image format
|
||||
, tiffSupport ? true, libtiff # TIFF image format
|
||||
, gifSupport ? true, giflib # GIF image format
|
||||
#, wicSupport ? true # Windows Imaging Component
|
||||
, alignedSupport ? false # Force aligned memory operations
|
||||
, swap16bitcspSupport ? false # Byte swap for 16bit color spaces
|
||||
|
@ -14,12 +14,6 @@
|
|||
, libwebpdecoderSupport ? true # Build libwebpdecoder
|
||||
}:
|
||||
|
||||
assert openglSupport -> freeglut != null && libGL != null && libGLU != null;
|
||||
assert pngSupport -> (libpng != null);
|
||||
assert jpegSupport -> (libjpeg != null);
|
||||
assert tiffSupport -> (libtiff != null);
|
||||
assert gifSupport -> (giflib != null);
|
||||
|
||||
let
|
||||
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
|
||||
in
|
||||
|
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
# Optional dependencies
|
||||
, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
|
||||
, c-ares ? null, libev ? null, openssl ? null, zlib ? null
|
||||
, enableAsioLib ? false, boost ? null
|
||||
, enableGetAssets ? false, libxml2 ? null
|
||||
, enableHpack ? false, jansson ? null
|
||||
, enableJemalloc ? false, jemalloc ? null
|
||||
, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null
|
||||
, c-ares, libev, openssl, zlib
|
||||
, enableAsioLib ? false, boost
|
||||
, enableGetAssets ? false, libxml2
|
||||
, enableHpack ? false, jansson
|
||||
, enableJemalloc ? false, jemalloc
|
||||
, enablePython ? false, python3Packages, ncurses
|
||||
|
||||
# Unit tests ; we have to set TZDIR, which is a GNUism.
|
||||
, enableTests ? stdenv.hostPlatform.isGnu, cunit ? null, tzdata ? null
|
||||
, enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata
|
||||
|
||||
# downstream dependencies, for testing
|
||||
, curl
|
||||
|
@ -25,13 +25,9 @@
|
|||
# All mutable patches (generated by GitHub or cgit) that are needed here
|
||||
# should be included directly in Nixpkgs as files.
|
||||
|
||||
assert enableApp -> c-ares != null && libev != null && openssl != null && zlib != null;
|
||||
assert enableAsioLib -> boost != null;
|
||||
assert enableGetAssets -> enableApp == true && libxml2 != null;
|
||||
assert enableHpack -> enableApp == true && jansson != null;
|
||||
assert enableJemalloc -> enableApp == true && jemalloc != null;
|
||||
assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null;
|
||||
assert enableTests -> cunit != null && tzdata != null;
|
||||
assert enableGetAssets -> enableApp;
|
||||
assert enableHpack -> enableApp;
|
||||
assert enableJemalloc -> enableApp;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp2";
|
||||
|
@ -47,14 +43,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (enableApp) [ installShellFiles ]
|
||||
++ lib.optionals (enablePython) [ cython ];
|
||||
++ lib.optionals (enablePython) [ python3Packages.cython ];
|
||||
|
||||
buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ]
|
||||
++ lib.optionals (enableAsioLib) [ boost ]
|
||||
++ lib.optionals (enableGetAssets) [ libxml2 ]
|
||||
++ lib.optionals (enableHpack) [ jansson ]
|
||||
++ lib.optionals (enableJemalloc) [ jemalloc ]
|
||||
++ lib.optionals (enablePython) [ python ncurses setuptools ];
|
||||
++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -62,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
"--disable-examples"
|
||||
(lib.enableFeature enableApp "app")
|
||||
] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ]
|
||||
++ lib.optionals (enablePython) [ "--with-cython=${cython}/bin/cython" ];
|
||||
++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ];
|
||||
|
||||
# Unit tests require CUnit and setting TZDIR environment variable
|
||||
doCheck = enableTests;
|
||||
|
@ -72,13 +68,13 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preInstall = lib.optionalString (enablePython) ''
|
||||
mkdir -p $out/${python.sitePackages}
|
||||
mkdir -p $out/${python3Packages.python.sitePackages}
|
||||
# convince installer it's ok to install here
|
||||
export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
|
||||
export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}"
|
||||
'';
|
||||
postInstall = lib.optionalString (enablePython) ''
|
||||
mkdir -p $python/${python.sitePackages}
|
||||
mv $out/${python.sitePackages}/* $python/${python.sitePackages}
|
||||
mkdir -p $python/${python3Packages.python.sitePackages}
|
||||
mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages}
|
||||
rm -r $out/lib
|
||||
'' + lib.optionalString (enableApp) ''
|
||||
installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx}
|
||||
|
|
|
@ -1,16 +1,12 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, Carbon ? null
|
||||
, libjpeg ? null
|
||||
, libpng ? null
|
||||
, Carbon
|
||||
, libjpeg
|
||||
, libpng
|
||||
, withJpegSupport ? true # support jpeg output
|
||||
, withPngSupport ? true # support png output
|
||||
}:
|
||||
|
||||
assert withJpegSupport -> libjpeg != null;
|
||||
assert withPngSupport -> libpng != null;
|
||||
assert stdenv.isDarwin -> Carbon != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tachyon";
|
||||
version = "0.99.4";
|
||||
|
|
|
@ -20,16 +20,7 @@
|
|||
, withYubikey ? false, libyubikey
|
||||
}:
|
||||
|
||||
assert withSqlite -> sqlite != null;
|
||||
assert withLdap -> openldap != null;
|
||||
assert withPcap -> libpcap != null;
|
||||
assert withCap -> libcap != null;
|
||||
assert withMemcached -> libmemcached != null;
|
||||
assert withRedis -> hiredis != null;
|
||||
assert withMysql -> libmysqlclient != null;
|
||||
assert withYubikey -> libyubikey != null;
|
||||
assert withCollectd -> collectd != null;
|
||||
assert withRest -> curl != null && withJson;
|
||||
assert withRest -> withJson;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeradius";
|
||||
|
|
|
@ -29006,8 +29006,6 @@ with pkgs;
|
|||
procmail = callPackage ../applications/misc/procmail { };
|
||||
|
||||
profanity = callPackage ../applications/networking/instant-messengers/profanity ({
|
||||
gtk = gtk3;
|
||||
python = python3;
|
||||
} // (config.profanity or {}));
|
||||
|
||||
properties-cpp = callPackage ../development/libraries/properties-cpp { };
|
||||
|
|
|
@ -5645,7 +5645,7 @@ in {
|
|||
});
|
||||
|
||||
nghttp2 = (toPythonModule (pkgs.nghttp2.override {
|
||||
inherit (self) python cython setuptools;
|
||||
python3Packages = self;
|
||||
inherit (pkgs) ncurses;
|
||||
enableApp = false; # build only libnghttp2 ...
|
||||
enablePython = true; # ... and its Python bindings
|
||||
|
|
Loading…
Reference in a new issue