diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b72a00d242e9c..56888c247bfd1 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,17 +1,11 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam - -# Extra Args -, type ? "" }: -let - libOnly = type == "lib"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}heimdal-${version}"; + name = "heimdal-${version}"; version = "7.5.0"; src = fetchFromGitHub { @@ -23,12 +17,10 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] - ++ (with perlPackages; [ JSON ]) - ++ optional (!libOnly) texinfo; + nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ] + ++ (with perlPackages; [ JSON ]); buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ] - ++ [ sqlite openssl libedit ] - ++ optionals (!libOnly) [ openldap pam ]; + ++ [ sqlite openssl libedit openldap pam ]; ## ugly, X should be made an option configureFlags = [ @@ -40,7 +32,6 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" "--without-x" "--with-berkeley-db=${db}" - ] ++ optionals (!libOnly) [ "--with-openldap=${openldap.dev}" ] ++ optionals (!stdenv.isFreeBSD) [ "--with-capng" @@ -50,24 +41,6 @@ stdenv.mkDerivation rec { sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common ''; - buildPhase = optionalString libOnly '' - (cd include; make -j $NIX_BUILD_CORES) - (cd lib; make -j $NIX_BUILD_CORES) - (cd tools; make -j $NIX_BUILD_CORES) - (cd include/hcrypto; make -j $NIX_BUILD_CORES) - (cd lib/hcrypto; make -j $NIX_BUILD_CORES) - ''; - - installPhase = optionalString libOnly '' - (cd include; make -j $NIX_BUILD_CORES install) - (cd lib; make -j $NIX_BUILD_CORES install) - (cd tools; make -j $NIX_BUILD_CORES install) - (cd include/hcrypto; make -j $NIX_BUILD_CORES install) - (cd lib/hcrypto; make -j $NIX_BUILD_CORES install) - rm -rf $out/{libexec,sbin,share} - find $out/bin -type f | grep -v 'krb5-config' | xargs rm - ''; - # We need to build hcrypt for applications like samba postBuild = '' (cd include/hcrypto; make -j $NIX_BUILD_CORES) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 98073b7bbdc46..9cc5f58376acf 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,16 +1,10 @@ { stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds , openssl, openldap, libedit - -# Extra Arguments -, type ? "" }: -let - libOnly = type == "lib"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}krb5-${version}"; + name = "krb5-${version}"; majorVersion = "1.15"; version = "${majorVersion}.2"; @@ -29,33 +23,13 @@ stdenv.mkDerivation rec { "ac_cv_printf_positional=yes" ]; - nativeBuildInputs = [ pkgconfig perl ] - ++ optional (!libOnly) yacc + nativeBuildInputs = [ pkgconfig perl yacc ] # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; - buildInputs = [ openssl ] - ++ optionals (!libOnly) [ openldap libedit ]; + buildInputs = [ openssl openldap libedit ]; preConfigure = "cd ./src"; - buildPhase = optionalString libOnly '' - MAKE="make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES" - (cd util; $MAKE) - (cd include; $MAKE) - (cd lib; $MAKE) - (cd build-tools; $MAKE) - ''; - - installPhase = optionalString libOnly '' - mkdir -p "$out"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}} \ - "$dev"/include/{gssapi,gssrpc,kadm5,krb5} - (cd util; $MAKE install) - (cd include; $MAKE install) - (cd lib; $MAKE install) - (cd build-tools; $MAKE install) - ${postInstall} - ''; - # not via outputBin, due to reference from libkrb5.so postInstall = '' moveToOutput bin "$dev" diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 11dd8ec32910b..addda1a4f23c8 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -3,8 +3,7 @@ , withData ? true, poppler_data , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobjectIntrospection ? null -, utils ? false -, minimal ? false, suffix ? "glib" +, minimal ? false }: let # beware: updates often break cups-filters build @@ -12,14 +11,14 @@ let # beware: updates often break cups-filters build mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { - name = "poppler-${suffix}-${version}"; + name = "poppler-${version}"; src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "bin" ]; buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") - (mkFlag utils "UTILS") + "-DENABLE_UTILS=on" (mkFlag qt5Support "QT5") ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 52b0abc48a7a5..2cea28aedb194 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -7,9 +7,6 @@ , dbus ? null, libffado ? null, alsaLib ? null , libopus ? null , darwin - -# Extra options -, prefix ? "" }: with stdenv.lib; @@ -17,16 +14,14 @@ let inherit (python2Packages) python dbus-python; shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; - libOnly = prefix == "lib"; - optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; - optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; - optLibffado = if libOnly then null else shouldUsePkg libffado; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; + optPythonDBus = shouldUsePkg dbus-python; + optLibffado = shouldUsePkg libffado; + optAlsaLib = shouldUsePkg alsaLib; optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation rec { - name = "${prefix}jack2-${version}"; + name = "jack2-${version}"; version = "1.9.12"; src = fetchFromGitHub { @@ -75,12 +70,8 @@ stdenv.mkDerivation rec { installPhase = '' python waf install - '' + (if libOnly then '' - rm -rf $out/{bin,share} - rm -rf $out/lib/{jack,libjacknet*,libjackserver*} - '' else '' wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH - ''); + ''; meta = { description = "JACK audio connection kit, version 2 with jackdbus"; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 4e3e373d244c7..ca85b5c41da12 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -4,17 +4,12 @@ # Optional dependencies , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null , pyqt4 ? null, dbus-python ? null, xdg_utils ? null - -# Other Flags -, prefix ? "" }: let shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; - libOnly = prefix == "lib"; - optLibjack2 = shouldUsePkg libjack2; optDbus = shouldUsePkg dbus; optDbus_cplusplus = shouldUsePkg dbus_cplusplus; @@ -24,7 +19,7 @@ let optXdg_utils = shouldUsePkg xdg_utils; in stdenv.mkDerivation rec { - name = "${prefix}ffado-${version}"; + name = "ffado-${version}"; version = "2.4.0"; src = fetchurl { @@ -36,7 +31,6 @@ stdenv.mkDerivation rec { buildInputs = [ expat libraw1394 libconfig libavc1394 libiec61883 - ] ++ stdenv.lib.optionals (!libOnly) [ optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4 optXdg_utils libxmlxx glibmm ]; @@ -69,10 +63,7 @@ stdenv.mkDerivation rec { SERIALIZE_USE_EXPAT=True \ ''; - installPhase = if libOnly then '' - scons PREFIX=$TMPDIR UDEVDIR=$TMPDIR \ - LIBDIR=$out/lib INCLUDEDIR=$out/include install - '' else '' + installPhase = '' scons PREFIX=$out PYPKGDIR=$PYDIR UDEVDIR=$out/lib/udev/rules.d install '' + stdenv.lib.optionalString (optPyqt4 != null && optPythonDBus != null) '' wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \ diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ed4a8889c67dc..fd7853305e89e 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -10,7 +10,7 @@ , x11Support ? false -, useSystemd ? true +, useSystemd ? stdenv.isLinux , # Whether to support the JACK sound system as a backend. jackaudioSupport ? false @@ -28,14 +28,11 @@ , zeroconfSupport ? false -, # Whether to build only the library. - libOnly ? false - , CoreServices, AudioUnit, Cocoa }: stdenv.mkDerivation rec { - name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; + name = "pulseaudio-${version}"; version = "11.1"; src = fetchurl { @@ -63,20 +60,18 @@ stdenv.mkDerivation rec { buildInputs = [ libtool libsndfile speexdsp fftwFloat ] - ++ lib.optionals stdenv.isLinux [ glib dbus ] + ++ lib.optionals stdenv.isLinux [ glib libasyncns webrtc-audio-processing ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] - ++ lib.optionals (!libOnly) ( - [ libasyncns webrtc-audio-processing ] - ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] - ++ lib.optional useSystemd systemd - ++ lib.optionals stdenv.isLinux [ alsaLib udev ] - ++ lib.optional airtunesSupport openssl - ++ lib.optional gconfSupport gconf - ++ lib.optionals bluetoothSupport [ bluez5 sbc ] - ++ lib.optional remoteControlSupport lirc - ++ lib.optional zeroconfSupport avahi - ); + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] + ++ lib.optional useSystemd systemd + ++ lib.optionals stdenv.isLinux [ alsaLib udev ] + ++ lib.optional airtunesSupport openssl + ++ lib.optional gconfSupport gconf + ++ lib.optionals bluetoothSupport [ bluez5 sbc ] + ++ lib.optional remoteControlSupport lirc + ++ lib.optional zeroconfSupport avahi + ; preConfigure = '' # Performs and autoreconf @@ -104,7 +99,7 @@ stdenv.mkDerivation rec { "--with-access-group=audio" "--with-bash-completion-dir=\${out}/share/bash-completions/completions" ] - ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" + ++ lib.optional jackaudioSupport "--enable-jack" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=\${out}/lib/systemd/user"; @@ -122,11 +117,9 @@ stdenv.mkDerivation rec { "pulseconfdir=$(out)/etc/pulse" ]; - postInstall = lib.optionalString libOnly '' - rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} - sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la - '' - + ''moveToOutput lib/cmake "$dev" ''; + postInstall = '' + moveToOutput lib/cmake "$dev" + ''; meta = { description = "Sound server for POSIX and Win32 systems"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 334905b79f2bf..ae209eb7a5fe5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -112,13 +112,17 @@ mapAliases (rec { libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 + libffado = ffadoFull; # added 2018-04-25 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 + libheimdal = heimdalFull; # added 2018-04-25 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 + libjack2 = jack2Full; # added 2018-04-25 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 + libv4l = v4l_utils.dev; # added 2018-04-25 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 @@ -162,6 +166,7 @@ mapAliases (rec { pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 postage = pgmanage; # added 2017-11-03 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + poppler_utils = poppler.bin; # added 2018-04-25 PPSSPP = ppsspp; # added 2017-10-01 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b59862c20edb..a82f8d51b0202 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -224,6 +224,10 @@ with pkgs; # uses the curl from the previous bootstrap phase (e.g. a statically # linked curl in the case of stdenv-linux). fetchurlBoot = stdenv.fetchurlBoot; + krb5Boot = krb5.override { + fetchurl = fetchurlBoot; + openldap = null; + }; fetchzip = callPackage ../build-support/fetchzip { }; @@ -1846,6 +1850,7 @@ with pkgs; curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; + kerberos = krb5Boot; http2Support = true; zlibSupport = true; sslSupport = zlibSupport; @@ -2707,11 +2712,11 @@ with pkgs; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = grub2_full.override { + grub2_efi = grub2.override { efiSupport = true; }; - grub2_light = grub2_full.override { + grub2_light = grub2.override { zfsSupport = false; }; @@ -3726,12 +3731,14 @@ with pkgs; mitmproxy = callPackage ../tools/networking/mitmproxy { }; - mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; - - mjpegtools = self.mjpegtoolsFull.override { + mjpegtools = callPackage ../tools/video/mjpegtools { withMinimal = true; }; + mjpegtoolsFull = mjpegtools.override { + withMinimal = false; + }; + mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); @@ -4315,28 +4322,27 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; - pinentry = pinentry_ncurses.override { - inherit gtk2; + pinentry = callPackage ../tools/security/pinentry { + libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = callPackage ../tools/security/pinentry { - libcap = if stdenv.isDarwin then null else libcap; + pinentry_ncurses = pinentry.override { gtk2 = null; }; - pinentry_emacs = pinentry_ncurses.override { + pinentry_emacs = pinentry.override { enableEmacs = true; }; - pinentry_gnome = pinentry_ncurses.override { + pinentry_gnome = pinentry.override { gcr = gnome3.gcr; }; - pinentry_qt4 = pinentry_ncurses.override { + pinentry_qt4 = pinentry.override { qt = qt4; }; - pinentry_qt5 = pinentry_ncurses.override { + pinentry_qt5 = pinentry.override { qt = qt5.qtbase; }; @@ -4359,7 +4365,7 @@ with pkgs; plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = callPackage ../development/arduino/platformio { }; - platformio = platformioPackages.platformio-chrootenv.override {}; + platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -8665,7 +8671,7 @@ with pkgs; cxxtest = callPackage ../development/libraries/cxxtest { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; + kerberos = if stdenv.isFreeBSD then libheimdal else krb5Boot; }; # Make bdb5 the default as it is the last release under the custom @@ -9346,10 +9352,9 @@ with pkgs; kerberos = libkrb5; heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; - libheimdal = heimdalFull.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; - harfbuzz-icu = callPackage ../development/libraries/harfbuzz { + harfbuzz-icu = harfbuzz.override { withIcu = true; withGraphite2 = true; }; @@ -9536,13 +9541,11 @@ with pkgs; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; - krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = krb5Full.override { - fetchurl = fetchurlBoot; - type = "lib"; - }; + krb5Full = krb5; + libkrb5 = krb5; languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -9731,14 +9734,12 @@ with pkgs; libdbi = callPackage ../development/libraries/libdbi { }; - libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { + libdbiDriversBase = libdbiDrivers.override { mysql = null; sqlite = null; }; - libdbiDrivers = libdbiDriversBase.override { - inherit sqlite mysql; - }; + libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; }; @@ -10416,10 +10417,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (v4l_utils.override { - withUtils = false; - }); - libva = callPackage ../development/libraries/libva { }; libva-minimal = libva.override { minimal = true; }; libva-utils = callPackage ../development/libraries/libva-utils { }; @@ -11000,13 +10997,10 @@ with pkgs; poppler_min = poppler.override { # TODO: maybe reduce even more minimal = true; - suffix = "min"; }; poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { }; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; - popt = callPackage ../development/libraries/popt { }; portaudio = callPackage ../development/libraries/portaudio { @@ -11230,7 +11224,6 @@ with pkgs; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5Support = true; - suffix = "qt5"; }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; @@ -12551,11 +12544,12 @@ with pkgs; # Name is changed to prevent use in packages; # please use libpulseaudio instead. - pulseaudioLight = callPackage ../servers/pulseaudio { + pulseaudio = callPackage ../servers/pulseaudio { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; + pulseaudioLight = pulseaudio; - pulseaudioFull = callPackage ../servers/pulseaudio { + pulseaudioFull = pulseaudio.override { gconf = gnome3.gconf; x11Support = true; jackaudioSupport = true; @@ -12569,11 +12563,6 @@ with pkgs; # libpulse implementations - libpulseaudio-vanilla = callPackage ../servers/pulseaudio { - libOnly = true; - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; - }; - apulse = callPackage ../misc/apulse { }; libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { @@ -12584,6 +12573,7 @@ with pkgs; libpulseaudio = libpulseaudio-vanilla; # meta only }; + libpulseaudio-vanilla = pulseaudioLight; libpulseaudio = libpulseaudio-vanilla; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -13150,8 +13140,8 @@ with pkgs; ffadoFull = callPackage ../os-specific/linux/ffado { inherit (python2Packages) python pyqt4 dbus-python; + libjack2 = libjack2.override { libffado = null; }; }; - libffado = ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -15740,19 +15730,19 @@ with pkgs; welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; - wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { - withQt = false; + wireshark = callPackage ../applications/networking/sniffers/wireshark { + withQt = true; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; + wireshark-qt = wireshark; # the cli binary is actually called tshark and often packaged under this name tshark = wireshark-cli; # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = wireshark-cli.override { withGtk = true; }; - wireshark-qt = wireshark-cli.override { withQt = true; }; - wireshark = wireshark-qt; + wireshark-gtk = wireshark.override { withGtk = true; }; + wireshark-cli = wireshark.override { withGtk = false; withQt = false; }; fbida = callPackage ../applications/graphics/fbida { }; @@ -16270,13 +16260,12 @@ with pkgs; libwebp = null; }; - imagemagick = imagemagickBig.override { + imagemagick = callPackage ../applications/graphics/ImageMagick { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; ghostscript = null; }; - imagemagickBig = callPackage ../applications/graphics/ImageMagick { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + imagemagickBig = imagemagick.override { inherit ghostscript; }; imagemagick7_light = lowPrio (imagemagick7.override { bzip2 = null; @@ -19869,12 +19858,12 @@ with pkgs; # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. - liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; - liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; - liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; - liblapack = liblapackWithAtlas; - liblapack_3_5_0 = liblapack_3_5_0WithAtlas; + liblapack = callPackage ../development/libraries/science/math/liblapack {}; + liblapackWithAtlas = liblapack; + liblapackWithoutAtlas = liblapack.override { atlas = null; }; + liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; + liblapack_3_5_0WithAtlas = liblapack_3_5_0; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -20634,7 +20623,6 @@ with pkgs; libopus = libopus.override { withCustomModes = true; }; inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; }; - libjack2 = jack2Full.override { prefix = "lib"; }; keynav = callPackage ../tools/X11/keynav { };