JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: remove aliases in nixpkgs

Browse Source 
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
This commit is contained in:
Matthew Bauer 2018-07-17 16:11:16 -04:00
parent d7d31fea7e
commit 76999cc40e
167 changed files with 460 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/default.nix
View File

@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
# $ nix-shell --run "make clean all" # $ nix-shell --run "make clean all"
# otherwise they won't reapply :) # otherwise they won't reapply :)
HIGHLIGHTJS = pkgs.documentation-highlighter; HIGHLIGHTJS = pkgs.documentation-highlighter;
XSL = "${pkgs.docbook5_xsl}/xml/xsl"; XSL = "${pkgs.docbook_xsl_ns}/xml/xsl";
RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
xsltFlags = lib.concatStringsSep " " [ xsltFlags = lib.concatStringsSep " " [

14
nixos/doc/manual/default.nix
View File

@ -209,13 +209,13 @@ let
--stringparam collect.xref.targets only \ --stringparam collect.xref.targets only \
--stringparam targets.filename "$out/manual.db" \ --stringparam targets.filename "$out/manual.db" \
--nonet \ --nonet \
${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${manual-combined}/manual-combined.xml ${manual-combined}/manual-combined.xml
cat > "$out/olinkdb.xml" <<EOF cat > "$out/olinkdb.xml" <<EOF
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE targetset SYSTEM <!DOCTYPE targetset SYSTEM
"file://${docbook5_xsl}/xml/xsl/docbook/common/targetdatabase.dtd" [ "file://${docbook_xsl_ns}/xml/xsl/docbook/common/targetdatabase.dtd" [
<!ENTITY manualtargets SYSTEM "file://$out/manual.db"> <!ENTITY manualtargets SYSTEM "file://$out/manual.db">
]> ]>
<targetset> <targetset>
@ -264,11 +264,11 @@ in rec {
${manualXsltprocOptions} \ ${manualXsltprocOptions} \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
--nonet --output $dst/ \ --nonet --output $dst/ \
${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${manual-combined}/manual-combined.xml ${manual-combined}/manual-combined.xml
mkdir -p $dst/images/callouts mkdir -p $dst/images/callouts
cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
cp ${../../../doc/style.css} $dst/style.css cp ${../../../doc/style.css} $dst/style.css
cp ${../../../doc/overrides.css} $dst/overrides.css cp ${../../../doc/overrides.css} $dst/overrides.css
@ -292,11 +292,11 @@ in rec {
${manualXsltprocOptions} \ ${manualXsltprocOptions} \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
--nonet --xinclude --output $dst/epub/ \ --nonet --xinclude --output $dst/epub/ \
${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \
${manual-combined}/manual-combined.xml ${manual-combined}/manual-combined.xml
mkdir -p $dst/epub/OEBPS/images/callouts mkdir -p $dst/epub/OEBPS/images/callouts
cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
echo "application/epub+zip" > mimetype echo "application/epub+zip" > mimetype
manual="$dst/nixos-manual.epub" manual="$dst/nixos-manual.epub"
zip -0Xq "$manual" mimetype zip -0Xq "$manual" mimetype
@ -324,7 +324,7 @@ in rec {
--param man.endnotes.are.numbered 0 \ --param man.endnotes.are.numbered 0 \
--param man.break.after.slash 1 \ --param man.break.after.slash 1 \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \
${manual-combined}/man-pages-combined.xml ${manual-combined}/man-pages-combined.xml
''; '';

2
nixos/modules/services/hardware/usbmuxd.nix
View File

@ -65,7 +65,7 @@ in
serviceConfig = { serviceConfig = {
# Trigger the udev rule manually. This doesn't require replugging the # Trigger the udev rule manually. This doesn't require replugging the
# device when first enabling the option to get it to work # device when first enabling the option to get it to work
ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f";
}; };
}; };

2
nixos/tests/installer.nix
View File

@ -237,7 +237,7 @@ let
libxml2.bin libxml2.bin
libxslt.bin libxslt.bin
docbook5 docbook5
docbook5_xsl docbook_xsl_ns
unionfs-fuse unionfs-fuse
ntp ntp
nixos-artwork.wallpapers.gnome-dark nixos-artwork.wallpapers.gnome-dark

4
pkgs/applications/audio/flacon/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain , shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain
, gtk3 , gtk3
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/flacon \ wrapProgram $out/bin/flacon \
--suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
--prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools
mp3gain lame wavpack vorbisgain ]}" mp3gain lame wavpack vorbisgain ]}"
''; '';

4
pkgs/applications/audio/pulseaudio-ctl/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, makeWrapper { stdenv, fetchFromGitHub, makeWrapper
, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }: , bc, dbus, gawk, gnused, libnotify, pulseaudio }:
let let
path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ]; path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ];
pname = "pulseaudio-ctl"; pname = "pulseaudio-ctl";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

20
pkgs/applications/backup/crashplan/crashplan-small-business.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, { stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
maxRam ? "1024m" }: maxRam ? "1024m" }:
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
rev = "1512021600670_4503"; rev = "1512021600670_4503";
pname = "CrashPlanSmb"; pname = "CrashPlanSmb";
name = "${pname}_${version}_${rev}"; name = "${pname}_${version}_${rev}";
src = fetchurl { src = fetchurl {
url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
vardir = "/var/lib/crashplan"; vardir = "/var/lib/crashplan";
manifestdir = "${vardir}/manifest"; manifestdir = "${vardir}/manifest";
postPatch = '' postPatch = ''
# patch scripts/CrashPlanEngine # patch scripts/CrashPlanEngine
substituteInPlace scripts/CrashPlanEngine \ substituteInPlace scripts/CrashPlanEngine \
@ -85,10 +85,10 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
fontconfig dbus gconf nss nspr alsaLib cups expat libudev fontconfig dbus gconf nss nspr alsaLib cups expat udev
libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
libXext libXfixes libXrender libXtst libXScrnSaver]}" libXext libXfixes libXrender libXtst libXScrnSaver]}"
''; '';

4
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils , intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils
, qt4 ? null , qt4 ? null
, withQt5 ? false, qtbase , withQt5 ? false, qtbase
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ buildInputs = [
pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
qt4 libaudit qt4 audit
] ++ optional withQt5 qtbase; ] ++ optional withQt5 qtbase;
configureFlags = [ configureFlags = [

4
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
, fontconfig, freetype, pam, dbus_libs, makeWrapper }: , fontconfig, freetype, pam, dbus, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slim-1.3.6"; name = "slim-1.3.6";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ cmake pkgconfig libjpeg libpng fontconfig freetype [ cmake pkgconfig libjpeg libpng fontconfig freetype
pam dbus_libs pam dbus
xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
]; ];

4
pkgs/applications/editors/jucipp/default.nix
View File

@ -1,7 +1,7 @@
{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
with stdenv.lib; with stdenv.lib;
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ buildInputs = [
dbus_libs dbus
openssl openssl
libxml2 libxml2
gnome3.gtksourceview gnome3.gtksourceview

4
pkgs/applications/editors/texstudio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}: { stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "texstudio"; pname = "texstudio";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ qt5.qmake pkgconfig ]; nativeBuildInputs = [ qt5.qmake pkgconfig ];
buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ];
qmakeFlags = [ "NO_APPDATA=True" ]; qmakeFlags = [ "NO_APPDATA=True" ];

4
pkgs/applications/graphics/draftsight/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, dbus, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
libXrender, libXcomposite }: libXrender, libXcomposite }:
@ -71,7 +71,7 @@ stdenv.mkDerivation {
}; };
libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 dbus alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcursor libXrandr libxcb libXi libSM libICE libXrender
libXcomposite ]; libXcomposite ];

4
pkgs/applications/graphics/exrdisplay/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: { stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name ="openexr_viewers-2.2.1"; name ="openexr_viewers-2.2.1";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; buildInputs = [ openexr fltk libGLU_combined ctl ];
meta = { meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings"; description = "Application for viewing OpenEXR images on a display at various exposure settings";

5
pkgs/applications/graphics/ktikz/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: { stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }:
# Warning: You will also need a working pdflatex installation containing # Warning: You will also need a working pdflatex installation containing
# at least auctex and pgf. # at least auctex and pgf.
@ -64,8 +64,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext qt5.full poppler_qt5 ]; buildInputs = [ gettext qt5.full poppler ];
enableParallelBuilding = true; enableParallelBuilding = true;
} }

6
pkgs/applications/kde/grantleetheme/default.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, copyPathsToStore, lib, kdepimTeam, mkDerivation, copyPathsToStore, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
}: }:
mkDerivation { mkDerivation {
@ -14,7 +14,7 @@ mkDerivation {
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
]; ];
propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ]; propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
} }

4
pkgs/applications/kde/kcalutils.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit, kidentitymanagement, kpimtextedit,
}: }:
@ -13,7 +13,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit kidentitymanagement kpimtextedit
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

4
pkgs/applications/kde/kdepim-addons.nix
View File

@ -4,7 +4,7 @@
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison libksieve, mailcommon, mailimporter, messagelib, poppler, prison
}: }:
mkDerivation { mkDerivation {
@ -18,6 +18,6 @@ mkDerivation {
akonadi-import-wizard akonadi-notes calendarsupport eventviews akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler_qt5 prison libksieve mailcommon mailimporter messagelib poppler prison
]; ];
} }

4
pkgs/applications/kde/kpimtextedit.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
}: }:
@ -13,7 +13,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
sonnet syntax-highlighting qttools sonnet syntax-highlighting qttools
]; ];
propagatedBuildInputs = [ ktextwidgets ]; propagatedBuildInputs = [ ktextwidgets ];

4
pkgs/applications/kde/messagelib.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5, akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
@ -16,7 +16,7 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
syntax-highlighting syntax-highlighting

4
pkgs/applications/misc/cpp-ethereum/default.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, jsoncpp , jsoncpp
, libjson_rpc_cpp , libjson-rpc-cpp
, curl , curl
, boost , boost
, leveldb , leveldb
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cmake cmake
jsoncpp jsoncpp
libjson_rpc_cpp libjson-rpc-cpp
curl curl
boost boost
leveldb leveldb

6
pkgs/applications/misc/diffpdf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: { stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.3"; version = "2.1.3";
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase poppler_qt5 ]; buildInputs = [ qtbase poppler ];
preConfigure = '' preConfigure = ''
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
lrelease diffpdf.pro lrelease diffpdf.pro
''; '';

6
pkgs/applications/misc/digitalbitbox/default.nix
View File

@ -7,7 +7,7 @@
, libevent , libevent
, libtool , libtool
, libqrencode , libqrencode
, libudev , udev
, libusb , libusb
, makeWrapper , makeWrapper
, pkgconfig , pkgconfig
@ -67,12 +67,12 @@ in stdenv.mkDerivation rec {
qttools qttools
]; ];
buildInputs = with stdenv.lib; [ buildInputs = [
# TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
libcap libcap
libevent libevent
libtool libtool
libudev udev
libusb libusb
libqrencode libqrencode

4
pkgs/applications/misc/hyper/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: , libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/misc/lxterminal/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte
, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
}: }:
let version = "0.3.1"; in let version = "0.3.1"; in
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
automake autoconf intltool pkgconfig automake autoconf intltool pkgconfig
libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs
]; ];
buildInputs = [ gtk3 vte ]; buildInputs = [ gtk3 vte ];

4
pkgs/applications/misc/memo/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, ag, tree, man, stdenv, { fetchFromGitHub, silver-searcher, tree, man, stdenv,
pandocSupport ? true, pandoc ? null pandocSupport ? true, pandoc ? null
, ... }: , ... }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
in '' in ''
mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
substituteInPlace memo \ substituteInPlace memo \
--replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \
--replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \
--replace "man_cmd=man" "man_cmd=${man}/bin/man" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \
--replace "pandoc_cmd=pandoc" "${pandocReplacement}" --replace "pandoc_cmd=pandoc" "${pandocReplacement}"

4
pkgs/applications/misc/moonlight-embedded/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, perl { stdenv, fetchgit, cmake, perl
, alsaLib, libevdev, libopus, libudev, SDL2 , alsaLib, libevdev, libopus, udev, SDL2
, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
, curl, expat, avahi, enet, libuuid , curl, expat, avahi, enet, libuuid
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ buildInputs = [
alsaLib libevdev libopus libudev SDL2 alsaLib libevdev libopus udev SDL2
ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
xorg.libpthreadstubs curl expat avahi enet libuuid xorg.libpthreadstubs curl expat avahi enet libuuid
]; ];

7
pkgs/applications/misc/nixnote2/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: { stdenv, mkDerivation, fetchFromGitHub, boost
, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
mkDerivation rec { mkDerivation rec {
name = "nixnote2-${version}"; name = "nixnote2-${version}";
@ -11,7 +12,7 @@ mkDerivation rec {
sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
}; };
buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -28,7 +29,7 @@ mkDerivation rec {
substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
''; '';
postInstal = '' postInstal = ''
cp images/windowIcon.png $out/share/pixmaps/nixnote2.png cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
''; '';

4
pkgs/applications/misc/onboard/default.nix
View File

@ -16,7 +16,7 @@
, intltool , intltool
, isocodes , isocodes
, libcanberra-gtk3 , libcanberra-gtk3
, libudev , udev
, libxkbcommon , libxkbcommon
, pkgconfig , pkgconfig
, procps , procps
@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec {
hunspell hunspell
isocodes isocodes
libcanberra-gtk3 libcanberra-gtk3
libudev udev
libxkbcommon libxkbcommon
wrapGAppsHook wrapGAppsHook
xorg.libXtst xorg.libXtst

7
pkgs/applications/misc/oneko/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, x11 }: { stdenv, fetchurl, xorg, xlibsWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.sakura.5"; version = "1.2.sakura.5";
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
}; };
buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];
configurePhase = "xmkmf"; configurePhase = "xmkmf";
installPhase = '' installPhase = ''
@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/applications/misc/qpdfview/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups {stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups
, file, ghostscript , file, ghostscript
}: }:
let let
@ -12,7 +12,7 @@ let
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ buildInputs = [
qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {

8
pkgs/applications/misc/roxterm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext { stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext
, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
, pkgconfig, python, pythonPackages, vte , pkgconfig, python, pythonPackages, vte
@ -22,13 +22,13 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib makeWrapper python pythonPackages.lockfile dbus dbus-glib
gdk_pixbuf gsettings-desktop-schemas gtk3 gdk_pixbuf gsettings-desktop-schemas gtk3
hicolor-icon-theme vte ]; hicolor-icon-theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
"-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; "-I${dbus.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it. # Fix up python path so the lockfile library is on it.
PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [

4
pkgs/applications/misc/terminus/default.nix
View File

@ -2,13 +2,13 @@
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs , libxcb, makeWrapper, nodejs
, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: , nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/misc/truecrypt/default.nix
View File

@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter:
$ make NOGUI=1 $ make NOGUI=1
*/ */
{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, { fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2,
wxGUI ? true wxGUI ? true
}: }:
@ -86,7 +86,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse devicemapper wxGTK nasm ]; buildInputs = [ fuse lvm2 wxGTK nasm ];
meta = { meta = {
description = "Free Open-Source filesystem on-the-fly encryption"; description = "Free Open-Source filesystem on-the-fly encryption";

4
pkgs/applications/misc/veracrypt/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself, { fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself,
wxGUI ? true wxGUI ? true
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ makeself yasm pkgconfig ]; nativeBuildInputs = [ makeself yasm pkgconfig ];
buildInputs = [ fuse devicemapper ] buildInputs = [ fuse lvm2 ]
++ optional wxGUI wxGTK30; ++ optional wxGUI wxGTK30;
makeFlags = optionalString (!wxGUI) "NOGUI=1"; makeFlags = optionalString (!wxGUI) "NOGUI=1";

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -5,7 +5,7 @@
, curl , curl
, cups , cups
, dbus-glib , dbus-glib
, dbus_libs , dbus
, fontconfig , fontconfig
, freetype , freetype
, gconf , gconf
@ -93,7 +93,7 @@ stdenv.mkDerivation {
curl curl
cups cups
dbus-glib dbus-glib
dbus_libs dbus
fontconfig fontconfig
freetype freetype
gconf gconf

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -8,7 +8,7 @@
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin , esteidfirefoxplugin
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
, libudev , udev
, kerberos , kerberos
}: }:
@ -66,7 +66,7 @@ let
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
++ extraNativeMessagingHosts ++ extraNativeMessagingHosts
); );
libs = [ libudev ] libs = lib.optional stdenv.isLinux udev
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport kerberos
++ lib.optionals (cfg.enableQuakeLive or false) ++ lib.optionals (cfg.enableQuakeLive or false)

4
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
, kerberos , kerberos
# command line arguments which are always set e.g "--disable-gpu" # command line arguments which are always set e.g "--disable-gpu"
@ -52,7 +52,7 @@ let
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsaLib libXdamage libXtst libXrandr expat cups alsaLib libXdamage libXtst libXrandr expat cups
dbus_libs gdk_pixbuf gcc-unwrapped.lib dbus gdk_pixbuf gcc-unwrapped.lib
systemd systemd
libexif libexif
liberation_ttf curl utillinux xdg_utils wget liberation_ttf curl utillinux xdg_utils wget

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd , alsaLib, dbus, cups, libexif, ffmpeg, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz , libuuid, xz
, gstreamer, gst-plugins-base, libxml2 , gstreamer, gst-plugins-base, libxml2
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

4
pkgs/applications/networking/feedreaders/newsboat/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "newsboat-${version}"; name = "newsboat-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace "ncurses5.4" "ncurses" --replace "ncurses5.4" "ncurses"
''; '';
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];

6
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
# Optional, Jitsi still runs without, but you may pass null: # Optional, Jitsi still runs without, but you may pass null:
, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg , alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,13 +25,11 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath ([ libPath = lib.makeLibraryPath ([
stdenv.cc.cc # For libstdc++. stdenv.cc.cc # For libstdc++.
] ++ lib.filter (x: x != null) [
alsaLib alsaLib
dbus_libs dbus
gtk2 gtk2
libpulseaudio libpulseaudio
openssl openssl
] ++ lib.optionals (xorg != null) [
xorg.libX11 xorg.libX11
xorg.libXext xorg.libXext
xorg.libXScrnSaver xorg.libXScrnSaver

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "purple-discord-${version}"; name = "purple-discord-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json_glib ]; buildInputs = [ pidgin json-glib ];
makeFlags = [ makeFlags = [
"DESTDIR=$(out)" "DESTDIR=$(out)"

7
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon { stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls}: , sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig libxslt ]; nativeBuildInputs = [ pkgconfig libxslt ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
++ stdenv.lib.optional doCheck dbus_daemon;
checkInputs = [ dbus.daemon ];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";

4
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: , gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
project = "telepathy-logger"; project = "telepathy-logger";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib dbus-glib libxml2 sqlite telepathy-glib
dbus_libs telepathy-glib.python dbus telepathy-glib.python
]; ];
configureFlags = "--enable-call"; configureFlags = "--enable-call";

4
pkgs/applications/networking/linssid/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }: { stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "linssid-${version}"; name = "linssid-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig qmake ]; nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ qtbase qtsvg boost qwt6 ]; buildInputs = [ qtbase qtsvg boost qwt ];
patches = [ ./0001-unbundled-qwt.patch ]; patches = [ ./0001-unbundled-qwt.patch ];

10
pkgs/applications/networking/mailreaders/inboxer/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: { stdenv, fetchurl, binutils, patchelf, makeWrapper
, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "inboxer-${version}"; name = "inboxer-${version}";
@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
expat expat
stdenv.cc.cc.lib stdenv.cc.cc.lib
libpulseaudio libpulseaudio
libudev udev
]; ];
in '' in ''
patchelf \ patchelf \
@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
patchelf \ patchelf \
--set-rpath "$out/opt/Inboxer:${lpath}" \ --set-rpath "$out/opt/Inboxer:${lpath}" \
$out/opt/Inboxer/libffmpeg.so $out/opt/Inboxer/libffmpeg.so
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/opt/Inboxer:${lpath}" \ --set-rpath "$out/opt/Inboxer:${lpath}" \
@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -R usr/share opt $out/ cp -R usr/share opt $out/

4
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -7,7 +7,7 @@
, cups , cups
, curl , curl
, dbus-glib , dbus-glib
, dbus_libs , dbus
, fontconfig , fontconfig
, freetype , freetype
, gdk_pixbuf , gdk_pixbuf
@ -86,7 +86,7 @@ stdenv.mkDerivation {
cups cups
curl curl
dbus-glib dbus-glib
dbus_libs dbus
fontconfig fontconfig
freetype freetype
gdk_pixbuf gdk_pixbuf

4
pkgs/applications/networking/sync/lsyncd/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, { stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync,
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }: asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lsyncd-${version}"; name = "lsyncd-${version}";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
rsync rsync
cmake lua pkgconfig cmake lua pkgconfig
asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/applications/science/electronics/kicad/unstable.nix
View File

@ -2,7 +2,7 @@
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp , doxygen, pcre, libpthreadstubs, libXdmcp
, oceSupport ? true, opencascade_oce , oceSupport ? true, opencascade
, ngspiceSupport ? true, libngspice , ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, wxPython , scriptingSupport ? true, swig, python, wxPython
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
''; '';
cmakeFlags = cmakeFlags =
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ] optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
++ optionals (scriptingSupport) [ ++ optionals (scriptingSupport) [
"-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING=ON"
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost cairo curl openssl boost
] ++ optional (oceSupport) opencascade_oce ] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice ++ optional (ngspiceSupport) libngspice
++ optionals (scriptingSupport) [ swig python wxPython ]; ++ optionals (scriptingSupport) [ swig python wxPython ];

5
pkgs/applications/science/robotics/gazebo/default.nix
View File

@ -5,7 +5,8 @@
, pythonPackages, utillinux , pythonPackages, utillinux
# these deps are hidden; cmake doesn't catch them # these deps are hidden; cmake doesn't catch them
, gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11 , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4
, xlibsWrapper
, withIgnitionTransport ? true , withIgnitionTransport ? true
, libav, withLibAvSupport ? true , libav, withLibAvSupport ? true
, openal, withAudioSupport ? false , openal, withAudioSupport ? false
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
# TODO: add these hidden deps to cmake configuration & submit upstream # TODO: add these hidden deps to cmake configuration & submit upstream
curl curl
tinyxml tinyxml
x11 xlibsWrapper
qt4 qt4
] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
++ optional withDocs doxygen ++ optional withDocs doxygen

6
pkgs/applications/version-management/cvs-fast-export/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, makeWrapper, flex, bison, {stdenv, fetchurl, makeWrapper, flex, bison,
asciidoc, docbook_xml_dtd_45, docbook_xml_xslt, asciidoc, docbook_xml_dtd_45, docbook_xsl,
libxml2, libxslt, libxml2, libxslt,
python27, rcs, cvs, git, python27, rcs, cvs, git,
coreutils, rsync}: coreutils, rsync}:
@ -21,7 +21,7 @@ mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
python27 rcs cvs git makeWrapper python27 rcs cvs git makeWrapper
]; ];
@ -29,7 +29,7 @@ mkDerivation rec {
preBuild = '' preBuild = ''
makeFlagsArray=( makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
LIBS="" LIBS=""
prefix="$out" prefix="$out"
) )

4
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xml_xslt, pkgconfig, luajit , docbook_xsl, pkgconfig, luajit
, gzip, bzip2, xz , gzip, bzip2, xz
, python, wrapPython, pygments, markdown , python, wrapPython, pygments, markdown
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
buildInputs = [ buildInputs = [
openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
]; ];
pythonPath = [ pygments markdown ]; pythonPath = [ pygments markdown ];

10
pkgs/applications/version-management/reposurgeon/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, python27Packages, git { stdenv, fetchurl, makeWrapper, python27Packages, git
, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
, bazaar ? null, cvs ? null, darcs ? null, fossil ? null , bazaar ? null, cvs ? null, darcs ? null, fossil ? null
, mercurial ? null, monotone ? null, rcs ? null, src ? null , mercurial ? null, monotone ? null, rcs ? null, src ? null
, subversion ? null, cvs_fast_export ? null }: , subversion ? null, cvs_fast_export ? null }:
@ -24,16 +24,16 @@ in mkDerivation rec {
}; };
# See https://gitlab.com/esr/reposurgeon/issues/17 # See https://gitlab.com/esr/reposurgeon/issues/17
patches = [ ./fix-preserve-type.patch ]; patches = [ ./fix-preserve-type.patch ];
buildInputs = buildInputs =
[ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++ [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++
optional (cython != null) cython optional (cython != null) cython
; ;
preBuild = '' preBuild = ''
makeFlagsArray=( makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
prefix="$out" prefix="$out"
pyinclude="-I${python}/include/python2.7" pyinclude="-I${python}/include/python2.7"
pylib="-L${python}/lib -lpython2.7" pylib="-L${python}/lib -lpython2.7"
@ -64,5 +64,5 @@ in mkDerivation rec {
--prefix PYTHONPATH : "${pythonpath}" --prefix PYTHONPATH : "${pythonpath}"
done done
'' ''
; ;
} }

6
pkgs/applications/video/dvdstyler/default.nix
View File

@ -6,7 +6,7 @@
, cdrtools, dvdauthor, dvdplusrwtools , cdrtools, dvdauthor, dvdplusrwtools
, dvdisasterSupport ? true, dvdisaster ? null , dvdisasterSupport ? true, dvdisaster ? null
, thumbnailSupport ? true, libgnomeui ? null , thumbnailSupport ? true, libgnomeui ? null
, udevSupport ? true, libudev ? null , udevSupport ? true, udev ? null
, dbusSupport ? true, dbus ? null , dbusSupport ? true, dbus ? null
, makeWrapper }: , makeWrapper }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
}; };
nativeBuildInputs = nativeBuildInputs =
[ pkgconfig ]; [ pkgconfig ];
packagesToBinPath = packagesToBinPath =
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
docbook5 zip makeWrapper ] docbook5 zip makeWrapper ]
++ packagesToBinPath ++ packagesToBinPath
++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals dvdisasterSupport [ dvdisaster ]
++ optionals udevSupport [ libudev ] ++ optionals udevSupport [ udev ]
++ optionals dbusSupport [ dbus ] ++ optionals dbusSupport [ dbus ]
++ optionals thumbnailSupport [ libgnomeui ]; ++ optionals thumbnailSupport [ libgnomeui ];

6
pkgs/applications/video/kodi/default.nix
View File

@ -19,7 +19,7 @@
, libcrossguid, libmicrohttpd , libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
, libplist, p11-kit, zlib , libplist, p11-kit, zlib
, dbusSupport ? true, dbus_libs ? null , dbusSupport ? true, dbus ? null
, joystickSupport ? true, cwiid ? null , joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null , nfsSupport ? true, libnfs ? null
, pulseSupport ? true, libpulseaudio ? null , pulseSupport ? true, libpulseaudio ? null
@ -30,7 +30,7 @@
, vdpauSupport ? true, libvdpau ? null , vdpauSupport ? true, libvdpau ? null
}: }:
assert dbusSupport -> dbus_libs != null; assert dbusSupport -> dbus != null;
assert nfsSupport -> libnfs != null; assert nfsSupport -> libnfs != null;
assert pulseSupport -> libpulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert rtmpSupport -> rtmpdump != null; assert rtmpSupport -> rtmpdump != null;
@ -139,7 +139,7 @@ in stdenv.mkDerivation rec {
ffmpeg ffmpeg
# libdvdcss libdvdnav libdvdread # libdvdcss libdvdnav libdvdread
] ]
++ lib.optional dbusSupport dbus_libs ++ lib.optional dbusSupport dbus
++ lib.optionals joystickSupport [ cwiid ] ++ lib.optionals joystickSupport [ cwiid ]
++ lib.optional nfsSupport libnfs ++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio

4
pkgs/applications/video/screenkey/default.nix
View File

@ -10,7 +10,7 @@
, libXtst , libXtst
, wrapGAppsHook , wrapGAppsHook
, defaultIconTheme , defaultIconTheme
, hicolor_icon_theme , hicolor-icon-theme
}: }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "screenkey"; pname = "screenkey";
@ -40,7 +40,7 @@ buildPythonApplication rec {
buildInputs = [ buildInputs = [
defaultIconTheme defaultIconTheme
hicolor_icon_theme hicolor-icon-theme
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/video/vlc/default.nix
View File

@ -6,7 +6,7 @@
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, onlyLibVLC ? false , onlyLibVLC ? false
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
fluidsynth wayland wayland-protocols fluidsynth wayland wayland-protocols

6
pkgs/applications/virtualization/docker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, bridge-utils, devicemapper, systemd , sqlite, iproute, bridge-utils, lvm2, systemd
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
, procps, libseccomp , procps, libseccomp
}: }:
@ -66,7 +66,7 @@ rec {
DOCKER_BUILDTAGS = [] DOCKER_BUILDTAGS = []
++ optional (systemd != null) [ "journald" ] ++ optional (systemd != null) [ "journald" ]
++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
++ optional (libseccomp != null) "seccomp"; ++ optional (libseccomp != null) "seccomp";
}) // rec { }) // rec {
@ -88,7 +88,7 @@ rec {
buildInputs = [ buildInputs = [
makeWrapper removeReferencesTo go-md2man go libtool makeWrapper removeReferencesTo go-md2man go libtool
] ++ optionals (stdenv.isLinux) [ ] ++ optionals (stdenv.isLinux) [
sqlite devicemapper btrfs-progs systemd libseccomp sqlite lvm2 btrfs-progs systemd libseccomp
]; ];
dontStrip = true; dontStrip = true;

4
pkgs/applications/virtualization/xen/4.5.nix
View File

@ -1,5 +1,5 @@
{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit { stdenv, callPackage, fetchurl, fetchpatch, fetchgit
, ocamlPackages_4_02 , ocaml-ng
, withInternalQemu ? true , withInternalQemu ? true
, withInternalTraditionalQemu ? true , withInternalTraditionalQemu ? true
, withInternalSeabios ? true , withInternalSeabios ? true
@ -258,4 +258,4 @@ callPackage (import ./generic.nix (rec {
else throw "this xen has no qemu builtin"; else throw "this xen has no qemu builtin";
}; };
})) ({ ocamlPackages = ocamlPackages_4_02; } // args) })) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args)

4
pkgs/applications/window-managers/afterstep/default.nix
View File

@ -2,7 +2,7 @@
, libjpeg, libtiff, libpng, freetype , libjpeg, libtiff, libpng, freetype
, fltk, gtk , fltk, gtk
, libX11, libXext, libICE , libX11, libXext, libICE
, dbus, dbus_libs , dbus
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus ];
# A strange type of bug: dbus is not immediately found by pkgconfig # A strange type of bug: dbus is not immediately found by pkgconfig
preConfigure = '' preConfigure = ''

4
pkgs/applications/window-managers/compton/git.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
libXrandr, libXrender, xwininfo }: libXrandr, libXrender, xwininfo }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
asciidoc asciidoc
docbook_xml_dtd_45 docbook_xml_dtd_45
docbook_xml_xslt docbook_xsl
pkgconfig pkgconfig
]; ];

4
pkgs/applications/window-managers/i3/easyfocus.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms
, xlibs , i3ipc-glib , glib , xorg , i3ipc-glib , glib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ]; buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ];
# Makefile has no rule for 'install' # Makefile has no rule for 'install'
installPhase = '' installPhase = ''

4
pkgs/applications/window-managers/orbment/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage { lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng , wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
, libdrm, libX11 , libdrm, libX11
, westonLite , westonLite
}: }:
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [ buildInputs = [
wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11
libdrm libdrm
]; ];

4
pkgs/applications/window-managers/sway/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl , cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs , wayland, wlc, libxkbcommon, pcre, json_c, dbus
, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs , pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
, libXdmcp , libXdmcp
, buildDocs ? true , buildDocs ? true
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cmake pkgconfig cmake pkgconfig
] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
buildInputs = [ buildInputs = [
wayland wlc libxkbcommon pcre json_c dbus_libs wayland wlc libxkbcommon pcre json_c dbus
pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
libXdmcp libXdmcp
]; ];

6
pkgs/build-support/rust/default-crate-overrides.nix
View File

@ -1,5 +1,5 @@
{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3,
libsodium, postgresql, ... }: libsodium, postgresql, ... }:
let let
@ -41,10 +41,10 @@ in
}; };
dbus = attrs: { dbus = attrs: {
buildInputs = [ pkgconfig dbus_libs ]; buildInputs = [ pkgconfig dbus ];
}; };
libdbus-sys = attrs: { libdbus-sys = attrs: {
buildInputs = [ pkgconfig dbus_libs ]; buildInputs = [ pkgconfig dbus ];
}; };
gobject-sys = attrs: { gobject-sys = attrs: {
buildInputs = [ dbus-glib ]; buildInputs = [ dbus-glib ];

6
pkgs/desktops/enlightenment/efl.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
, fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio , fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
, curl, libinput, systemd, mesa_noglu, writeText , curl, libinput, systemd, mesa_noglu, writeText
}: }:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm harfbuzz jbig2dec librsvg alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
libinput utillinux fribidi SDL2 ]; libinput utillinux fribidi SDL2 ];
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++

4
pkgs/desktops/gnome-2/platform/GConf/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: , polkit, intltool, dbus, gtk2 ? null, withGtk ? false }:
assert withGtk -> (gtk2 != null); assert withGtk -> (gtk2 != null);
@ -13,7 +13,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] buildInputs = [ ORBit2 dbus dbus-glib libxml2 ]
# polkit requires pam, which requires shadow.h, which is not available on # polkit requires pam, which requires shadow.h, which is not available on
# darwin # darwin
++ stdenv.lib.optional (!stdenv.isDarwin) polkit ++ stdenv.lib.optional (!stdenv.isDarwin) polkit

4
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib
, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-vfs-${minVer}.4"; name = "gnome-vfs-${minVer}.4";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
buildInputs = buildInputs =
[ libxml2 bzip2 openssl dbus-glib fam cdparanoia [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia
gnome_mime_data avahi acl gnome_mime_data avahi acl
]; ];

2
pkgs/desktops/gnome-3/core/empathy/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
, file, librsvg, gnome3, gdk_pixbuf , file, librsvg, gnome3, gdk_pixbuf
, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream , dbus-glib, telepathy-glib, telepathy-farstream
, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
, telepathy-logger, libnotify, clutter, libsoup, gnutls , telepathy-logger, libnotify, clutter, libsoup, gnutls

6
pkgs/desktops/gnome-3/core/folks/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs , vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus
, telepathy-glib, evolution-data-server, libsecret, db }: , telepathy-glib, evolution-data-server, libsecret, db }:
# TODO: enable more folks backends # TODO: enable more folks backends
@ -16,14 +16,14 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
# dbus_daemon needed for tests # dbus_daemon needed for tests
buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus
vala libsecret libxml2 libsoup nspr nss intltool db ]; vala libsecret libxml2 libsoup nspr nss intltool db ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-fatal-warnings"; configureFlags = "--disable-fatal-warnings";
NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"
"-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc , webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc
, telepathy-glib, gettext, dbus_libs, icu, glib-networking , telepathy-glib, gettext, icu, glib-networking
, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos , libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos
}: }:

4
pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: { stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }:
let let
pname = "libgnome-keyring"; pname = "libgnome-keyring";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; propagatedBuildInputs = [ glib gobjectIntrospection dbus libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
passthru = { passthru = {

6
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
View File

@ -1,4 +1,4 @@
{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: { config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-shell-system-monitor-${version}"; name = "gnome-shell-system-monitor-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
glib_networking glib-networking
libgtop libgtop
]; ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
(substituteAll { (substituteAll {
src = ./paths_and_nonexisting_dirs.patch; src = ./paths_and_nonexisting_dirs.patch;
gtop_path = "${libgtop}/lib/girepository-1.0"; gtop_path = "${libgtop}/lib/girepository-1.0";
glib_net_path = "${glib_networking}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0";
}) })
]; ];

6
pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit
, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: , fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus, desktop-file-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-packagekit-${version}"; name = "gnome-packagekit-${version}";
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; };
}; };
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.dev}/include/dbus-1.0";
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];
buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit
libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; libcanberra-gtk3 libnotify dbus-glib dbus ];
prePatch = "patchShebangs meson_post_install.sh"; prePatch = "patchShebangs meson_post_install.sh";

4
pkgs/desktops/gnustep/back/default.nix
View File

@ -2,7 +2,7 @@
, cairo , cairo
, fetchurl , fetchurl
, base, gui , base, gui
, x11 , xlibsWrapper
, freetype , freetype
, pkgconfig , pkgconfig
, libXmu , libXmu
@ -17,7 +17,7 @@ gsmakeDerivation {
sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo base gui freetype x11 libXmu ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ];
meta = { meta = {
description = "A generic backend for GNUstep"; description = "A generic backend for GNUstep";
}; };

4
pkgs/desktops/lumina/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils,
numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake,
qttools, poppler_qt5, wrapGAppsHook qttools, poppler, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
qtsvg qtsvg
qtmultimedia qtmultimedia
qtx11extras qtx11extras
poppler_qt5 poppler
fluxbox fluxbox
xscreensaver xscreensaver
desktop-file-utils desktop-file-utils

4
pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, { stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }: xfce, libwnck3, libdbusmenu, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xfce4-vala-panel-appmenu-plugin-${version}"; name = "xfce4-vala-panel-appmenu-plugin-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
libwnck3 libdbusmenu-glib gobjectIntrospection ]; libwnck3 libdbusmenu gobjectIntrospection ];
patches = [ patches = [
(substituteAll { (substituteAll {

4
pkgs/desktops/xfce4-13/exo/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3 { mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3
, libxfce4ui, libxfce4util }: , libxfce4ui, libxfce4util }:
mkXfceDerivation rec { mkXfceDerivation rec {
@ -14,7 +14,7 @@ mkXfceDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace docs/reference/Makefile.am \ substituteInPlace docs/reference/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \ --replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xml_xslt}/share/xml/docbook-xsl ${docbook_xsl}/share/xml/docbook-xsl
''; '';
meta = { meta = {

4
pkgs/desktops/xfce4-13/thunar/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null { mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null
, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: , libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
mkXfceDerivation rec { mkXfceDerivation rec {
@ -11,7 +11,7 @@ mkXfceDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace docs/Makefile.am \ substituteInPlace docs/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \ --replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xml_xslt}/share/xml/docbook-xsl ${docbook_xsl}/share/xml/docbook-xsl
''; '';
nativeBuildInputs = [ libxslt ]; nativeBuildInputs = [ libxslt ];

4
pkgs/desktops/xfce4-13/xfburn/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: { mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "apps"; category = "apps";
@ -8,7 +8,7 @@ mkXfceDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace docs/Makefile.am \ substituteInPlace docs/Makefile.am \
--replace http://docbook.sourceforge.net/release/xsl/current \ --replace http://docbook.sourceforge.net/release/xsl/current \
${docbook_xml_xslt}/share/xml/docbook-xsl ${docbook_xsl}/share/xml/docbook-xsl
''; '';
sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";

5
pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
View File

@ -1,4 +1,5 @@
{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }: { mkXfceDerivation, autoreconfHook, autoconf, automake
, glib, gtk-doc, intltool, libtool }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "xfce"; category = "xfce";
@ -13,7 +14,7 @@ mkXfceDerivation rec {
autoconf autoconf
automake automake
glib glib
gtk_doc gtk-doc
intltool intltool
libtool libtool
]; ];

4
pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2 { mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2
, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: , libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
mkXfceDerivation rec { mkXfceDerivation rec {
@ -16,7 +16,7 @@ mkXfceDerivation rec {
''; '';
buildInputs = [ buildInputs = [
dbus_glib dbus-glib
gst-plugins-base gst-plugins-base
gtk2 gtk2
libICE libICE

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -442,7 +442,7 @@ self: super: builtins.intersectAttrs super {
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
else dontCheck super.fsnotify; else dontCheck super.fsnotify;
hidapi = addExtraLibrary super.hidapi pkgs.libudev; hidapi = addExtraLibrary super.hidapi pkgs.udev;
hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };

6
pkgs/development/interpreters/racket/default.nix
View File

@ -5,7 +5,7 @@
, readline, sqlite , readline, sqlite
, disableDocs ? false , disableDocs ? false
, CoreFoundation , CoreFoundation
, gsettings_desktop_schemas , gsettings-desktop-schemas
}: }:
let let
@ -20,7 +20,7 @@ let
glib glib
gmp gmp
gtk3 gtk3
gsettings_desktop_schemas gsettings-desktop-schemas
libedit libedit
libjpeg libjpeg
libpng libpng
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
]; ];
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ] buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
preConfigure = '' preConfigure = ''

14
pkgs/development/libraries/flatpak/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc , gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
let let
version = "0.99.3"; version = "0.99.3";
@ -28,12 +28,12 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
] ++ stdenv.lib.optionals doCheck checkInputs; ] ++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ buildInputs = [
bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xlibs.libXau libsoup lzma ostree polkit python3 systemd xorg.libXau
]; ];
checkInputs = [ valgrind ]; checkInputs = [ valgrind ];
@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
wrapProgram $out/bin/flatpak \ wrapProgram $out/bin/flatpak \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
''; '';

4
pkgs/development/libraries/geis/default.nix
View File

@ -3,7 +3,7 @@
, python3Packages , python3Packages
, wrapGAppsHook , wrapGAppsHook
, atk , atk
, dbus_libs , dbus
, evemu , evemu
, frame , frame
, gdk_pixbuf , gdk_pixbuf
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
[ pygobject3 ]; [ pygobject3 ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail
gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
]; ];

5
pkgs/development/libraries/glew/1.10.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libGLU, x11, libXmu, libXi { stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
, buildPlatform, hostPlatform , buildPlatform, hostPlatform
, AGL ? null , AGL ? null
}: }:
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
}; };
buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; buildInputs = [ xlibsWrapper libXmu libXi ]
++ optionals stdenv.isDarwin [ AGL ];
propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
patchPhase = '' patchPhase = ''

5
pkgs/development/libraries/glib/default.nix
View File

@ -4,7 +4,8 @@
, utillinuxMinimal ? null , utillinuxMinimal ? null
# this is just for tests (not in closure of any regular package) # this is just for tests (not in closure of any regular package)
, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false , coreutils, dbus, libxml2, tzdata, desktop-file-utils
, shared-mime-info, doCheck ? false
}: }:
with stdenv.lib; with stdenv.lib;
@ -121,7 +122,7 @@ stdenv.mkDerivation rec {
export XDG_RUNTIME_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP" export HOME="$TMP"
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
export PATH="$PATH:$(pwd)/gobject" export PATH="$PATH:$(pwd)/gobject"
echo "PATH=$PATH" echo "PATH=$PATH"

2
pkgs/development/libraries/gtkd/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
, pango, pkgconfig, substituteAll, which }: , pango, pkgconfig, substituteAll, which, gst_plugins_base }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkd-${version}"; name = "gtkd-${version}";

4
pkgs/development/libraries/gupnp-dlna/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst_plugins_base }: { stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gupnp-dlna-${version}"; name = "gupnp-dlna-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
buildInputs = [ gupnp gst_plugins_base ]; buildInputs = [ gupnp gst-plugins-base ];
meta = { meta = {
homepage = https://wiki.gnome.org/Projects/GUPnP/; homepage = https://wiki.gnome.org/Projects/GUPnP/;

4
pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
View File

@ -1,6 +1,6 @@
{ {
mkDerivation, lib, mkDerivation, lib,
extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns,
karchive, ki18n, qtbase, karchive, ki18n, qtbase,
perl, perlPackages perl, perlPackages
}: }:
@ -24,7 +24,7 @@ mkDerivation {
patches = [ ./kdoctools-no-find-docbook-xml.patch ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ];
cmakeFlags = [ cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"
]; ];
postFixup = '' postFixup = ''
moveToOutput "share/doc" "$dev" moveToOutput "share/doc" "$dev"

6
pkgs/development/libraries/libblockdev/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml , docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml
, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key , cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
}: }:
let let
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/libgnome-keyring/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, { stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig,
intltool }: intltool }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; propagatedBuildInputs = [ glib dbus libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
meta = { meta = {

4
pkgs/development/libraries/libindicate/default.nix
View File

@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib, file { stdenv, fetchurl, lib, file
, pkgconfig, autoconf , pkgconfig, autoconf
, glib, dbus-glib, libdbusmenu-glib , glib, dbus-glib, libdbusmenu
, gtkVersion ? "3", gtk2 ? null, gtk3 ? null , gtkVersion ? "3", gtk2 ? null, gtk3 ? null
, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ];
buildInputs = [ buildInputs = [
glib dbus-glib libdbusmenu-glib glib dbus-glib libdbusmenu
python pygobject2 pygtk python pygobject2 pygtk
] ++ (if gtkVersion == "2" ] ++ (if gtkVersion == "2"
then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]

4
pkgs/development/libraries/libstroke/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, automake, autoconf, x11}: {stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libstroke-0.5.1"; name = "libstroke-0.5.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
}; };
buildInputs = [ automake autoconf x11 ]; buildInputs = [ automake autoconf xlibsWrapper ];
# libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
# Also, modern automake doesn't like things and returns error code 63. But it generates the file. # Also, modern automake doesn't like things and returns error code 63. But it generates the file.

4
pkgs/development/libraries/libvirt/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit { stdenv, fetchurl, fetchgit
, pkgconfig, makeWrapper, libtool, autoconf, automake , pkgconfig, makeWrapper, libtool, autoconf, automake
, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr , coreutils, libxml2, gnutls, perl, python2, attr
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
] ++ optionals (!buildFromTarball) [ ] ++ optionals (!buildFromTarball) [
libtool autoconf automake libtool autoconf automake
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libpciaccess lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted libapparmor libcap_ng numactl attr parted
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen xen

6
pkgs/development/libraries/mailcore2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate
, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl , libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
libetpan cmake icu cyrus_sasl libctemplate libuchardet glib libetpan cmake icu cyrus_sasl libctemplate libuchardet glib
libtidy libxml2 libuuid openssl html-tidy libxml2 libuuid openssl
]; ];
postPatch = '' postPatch = ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace " icule iculx" "" \ --replace " icule iculx" "" \
--replace "tidy/tidy.h" "tidy.h" \ --replace "tidy/tidy.h" "tidy.h" \
--replace "/usr/include/tidy" "${libtidy}/include" \ --replace "/usr/include/tidy" "${html-tidy}/include" \
--replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
--replace buffio.h tidybuffio.h --replace buffio.h tidybuffio.h

4
pkgs/development/libraries/pipewire/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg , glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
, sbc, SDL2, makeFontsConf, freefont_ttf , sbc, SDL2, makeFontsConf, freefont_ttf
}: }:
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
]; ];
mesonFlags = [ mesonFlags = [

4
pkgs/development/libraries/strigi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
, clucene_core, fam, zlib, dbus_tools, pkgconfig , clucene_core, fam, zlib, dbus, pkgconfig
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
CLUCENE_HOME = clucene_core; CLUCENE_HOME = clucene_core;
buildInputs = buildInputs =
[ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus ];
nativeBuildInputs = [ cmake pkgconfig perl ]; nativeBuildInputs = [ cmake pkgconfig perl ];

4
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon { stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus
, telepathy-farstream, telepathy-glib, fetchpatch }: , telepathy-farstream, telepathy-glib, fetchpatch }:
let let
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig python ]; nativeBuildInputs = [ cmake pkgconfig python ];
propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
buildInputs = [ dbus-glib ]; buildInputs = [ dbus-glib ];
checkInputs = [ dbus_daemon dbus-python ]; checkInputs = [ dbus.daemon dbus-python ];
patches = [ patches = [
# https://github.com/TelepathyIM/telepathy-qt/issues/25 # https://github.com/TelepathyIM/telepathy-qt/issues/25

4
pkgs/development/libraries/vulkan-loader/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
let version = "1.1.77.0"; in let version = "1.1.77.0"; in
assert version == vulkan-headers.version; assert version == vulkan-headers.version;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = [ cmakeFlags = [

Some files were not shown because too many files have changed in this diff Show More