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

Merge pull request #74023 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2019-11-30 21:12:27 +01:00 committed by GitHub
commit f99271be7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
390 changed files with 1876 additions and 9301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/audio/helm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub , xorg, libGL, freetype, alsaLib, curl, libjack2 { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
, lv2, pkgconfig, libGLU_combined }: , lv2, pkgconfig, libGLU, libGL }:
stdenv.mkDerivation { stdenv.mkDerivation {
version = "0.9.0"; version = "0.9.0";
@ -14,8 +14,8 @@
buildInputs = [ buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender xorg.libXrandr libGL xorg.libXinerama xorg.libXrender xorg.libXrandr
freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2 freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2
]; ];
CXXFLAGS = "-DHAVE_LROUND"; CXXFLAGS = "-DHAVE_LROUND";

4
pkgs/applications/audio/jack-oscrolloscope/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: { stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jack_oscrolloscope"; pname = "jack_oscrolloscope";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL libjack2 libGLU_combined ]; buildInputs = [ SDL libjack2 libGLU libGL ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, lv2, libGLU_combined, gtk2, cairo, pango, fftwFloat, libjack2 }: , lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }:
let let
version = "0.9.10"; version = "0.9.10";
@ -26,7 +26,7 @@ stdenv.mkDerivation {
inherit name; inherit name;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftwFloat libjack2 ]; buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ];
srcs = [ src robtkSrc ]; srcs = [ src robtkSrc ];
sourceRoot = name; sourceRoot = name;

7
pkgs/applications/audio/pianobooster/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: { stdenv, fetchurl, alsaLib, cmake, libGLU, libGL, makeWrapper, qt4 }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "pianobooster"; pname = "pianobooster";
@ -16,12 +16,13 @@ stdenv.mkDerivation {
preConfigure = "cd src"; preConfigure = "cd src";
buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ]; buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ];
NIX_LDFLAGS = [ "-lGL" "-lpthread" ]; NIX_LDFLAGS = [ "-lGL" "-lpthread" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/pianobooster \ wrapProgram $out/bin/pianobooster \
--prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib --prefix LD_LIBRARY_PATH : ${libGL}/lib \
--prefix LD_LIBRARY_PATH : ${libGLU}/lib
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -1,5 +1,5 @@
{ stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 { stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2
, libGLU_combined, pkgconfig, ttf_bitstream_vera , libGLU, libGL, pkgconfig, ttf_bitstream_vera
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL
ttf_bitstream_vera ttf_bitstream_vera
]; ];

4
pkgs/applications/audio/sisco.lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }: { stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }:
let let
name = "sisco.lv2-${version}"; name = "sisco.lv2-${version}";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
sourceRoot = src.name; sourceRoot = src.name;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ]; buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ];
postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
sisco_VERSION = version; sisco_VERSION = version;

4
pkgs/applications/audio/soundscape-renderer/default.nix
View File

@ -11,7 +11,7 @@
, boost , boost
, ecasound , ecasound
, glibcLocales , glibcLocales
, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL , libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -33,7 +33,7 @@ stdenv.mkDerivation {
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers # 2) Make it find ecasound headers

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg , libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg
}: }:
assert stdenv ? glibc; assert stdenv ? glibc;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL
minixml zlib xorg.libpthreadstubs pcre minixml zlib xorg.libpthreadstubs pcre
]; ];

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

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, # Patchelf dependencies: , # Patchelf dependencies:
alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL
, openssl, xorg, zlib , openssl, xorg, zlib
}: }:
@ -56,7 +56,7 @@ in
$out/kodestudio $out/kodestudio
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \ --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \
$out/resources/app/extensions/krom/Krom/linux/Krom $out/resources/app/extensions/krom/Krom/linux/Krom
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, libpng, python3 { stdenv, fetchFromGitHub, libpng, python3
, libGLU_combined, qtbase, wrapQtAppsHook, ncurses , libGLU, libGL, qtbase, wrapQtAppsHook, ncurses
, cmake, flex, lemon , cmake, flex, lemon
}: }:
@ -29,7 +29,7 @@ in
buildInputs = [ buildInputs = [
libpng python3 python3.pkgs.boost libpng python3 python3.pkgs.boost
libGLU_combined qtbase wrapQtAppsHook libGLU libGL qtbase wrapQtAppsHook
ncurses ncurses
]; ];

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

@ -2,7 +2,7 @@
flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11, flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11,
pythonPackages, gettext, intltool, babl, gegl, pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xorgproto, libXmu, openexr, glib, makedepend, xorgproto, libXmu, openexr,
libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : libGLU, libGL, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
let let
inherit (pythonPackages) python pygtk; inherit (pythonPackages) python pygtk;
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib libX11 python pygtk gettext intltool babl libexif zlib libX11 python pygtk gettext intltool babl
gegl glib makedepend xorgproto libXmu openexr libGLU_combined gegl glib makedepend xorgproto libXmu openexr libGLU libGL
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
] ++ (with perlPackages; [ perl XMLParser ]); ] ++ (with perlPackages; [ perl XMLParser ]);

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU, libGL, xdg_utils,
dbus, 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,
@ -71,7 +71,7 @@ stdenv.mkDerivation {
sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx"; sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
}; };
libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU libGL xdg_utils
dbus 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

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: { stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, 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 ctl ]; buildInputs = [ openexr fltk libGLU libGL 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";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng, { stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng,
libXxf86vm }: libXxf86vm }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
}; };
buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng
libXxf86vm ]; libXxf86vm ];
postPatch = '' postPatch = ''

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

@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch
, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib , libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra
wxGTK zlib wxGTK zlib
]; ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc { stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ];
buildInputs = [ buildInputs = [
libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost cairomm imagemagick libjpeg libtiff boost cairomm imagemagick libjpeg libtiff
ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu
]; ];

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

@ -3,7 +3,7 @@
, alsaLib , alsaLib
, glib , glib
, gst_all_1 , gst_all_1
, libGLU_combined , libGLU, libGL
, xorg , xorg
}: }:
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
glib glib
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
libGLU_combined libGLU libGL
xorg.libX11 xorg.libX11
]; ];
in '' in ''

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

@ -7,7 +7,7 @@
, flex , flex
, eigen , eigen
, boost , boost
, libGLU_combined , libGLU, libGL
, glew , glew
, opencsg , opencsg
, cgal , cgal
@ -44,7 +44,7 @@ mkDerivation rec {
eigen boost glew opencsg cgal mpfr gmp glib eigen boost glew opencsg cgal mpfr gmp glib
harfbuzz lib3mf libzip double-conversion freetype fontconfig harfbuzz lib3mf libzip double-conversion freetype fontconfig
qtbase qtmultimedia qscintilla qtbase qtmultimedia qscintilla
] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined ] ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL ]
++ stdenv.lib.optional stdenv.isDarwin qtmacextras ++ stdenv.lib.optional stdenv.isDarwin qtmacextras
; ;

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

@ -1,6 +1,6 @@
{ {
stdenv, fetchFromGitHub, cmake, makeWrapper stdenv, fetchFromGitHub, cmake, makeWrapper
,qtbase, qttools, python, libGLU_combined ,qtbase, qttools, python, libGLU, libGL
,libXt, qtx11extras, qtxmlpatterns ,libXt, qtx11extras, qtxmlpatterns
, mkDerivation , mkDerivation
}: }:
@ -43,7 +43,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
python python
python.pkgs.numpy python.pkgs.numpy
libGLU_combined libGLU libGL
libXt libXt
qtbase qtbase
qtx11extras qtx11extras

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

@ -1,7 +1,7 @@
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender , ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile , libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages
, openvdb, libXxf86vm, tbb , openvdb, libXxf86vm, tbb
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2 , jackaudioSupport ? false, libjack2
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ boost ffmpeg gettext glew ilmbase [ boost ffmpeg gettext glew ilmbase
libXi libX11 libXext libXrender libXi libX11 libXext libXrender
freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU libGL openal
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
(opensubdiv.override { inherit cudaSupport; }) (opensubdiv.override { inherit cudaSupport; })
openvdb libXxf86vm tbb openvdb libXxf86vm tbb

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

@ -13,7 +13,7 @@
, miniupnpc , miniupnpc
, libmicrohttpd , libmicrohttpd
, gmp , gmp
, libGLU_combined , libGLU, libGL
, extraCmakeFlags ? [] , extraCmakeFlags ? []
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
miniupnpc miniupnpc
libmicrohttpd libmicrohttpd
gmp gmp
libGLU_combined libGLU libGL
]; ];
dontStrip = true; dontStrip = true;

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv { stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11
, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: , zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
@ -20,7 +20,7 @@ let
libICE libICE
libXi libXi
libXv libXv
libGLU_combined libGLU libGL
libXrender libXrender
libXrandr libXrandr
libXfixes libXfixes

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

@ -1,6 +1,6 @@
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: { stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }:
let let
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iceSL"; pname = "iceSL";

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

@ -1,5 +1,5 @@
{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
libGLU_combined, freetype, xclip, inotify-tools, procps }: libGLU, libGL, freetype, xclip, inotify-tools, procps }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
}); });
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml mupdf libX11 libGLU_combined freetype ]; buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ];
dontStrip = true; dontStrip = true;

10
pkgs/applications/misc/merkaartor/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj { stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj
, qtbase, qtsvg, qtwebkit }: , qtbase, qtsvg, qtwebview, qtwebkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "merkaartor"; pname = "merkaartor";
version = "0.18.3"; version = "unstable-2019-11-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openstreetmap"; owner = "openstreetmap";
repo = "merkaartor"; repo = "merkaartor";
rev = version; rev = "29b3388680a03f1daac0037a2b504ea710da879a";
sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz";
}; };
nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 { stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2
, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib , SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib
, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango , librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango
, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc
, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper , gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk2 fontconfig freetype imlib2 libGLU_combined freeimage gtk2 fontconfig freetype imlib2 libGLU libGL freeimage
libxslt libXmu freeglut python gettext quesoglc gd libxslt libXmu freeglut python gettext quesoglc gd
fribidi pcre dbus dbus-glib librsvg shapelib glib fribidi pcre dbus dbus-glib librsvg shapelib glib
cairo gdk-pixbuf pango atk cairo gdk-pixbuf pango atk

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }: { stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -28,7 +28,7 @@ stdenv.mkDerivation {
install -Dm644 reference.brf $out/share/openBrf/reference.brf install -Dm644 reference.brf $out/share/openBrf/reference.brf
patchelf \ patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \ --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \
$out/share/openBrf/openBrf $out/share/openBrf/openBrf
mkdir -p "$out/bin" mkdir -p "$out/bin"

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -13,7 +13,7 @@
, bison, gperf , bison, gperf
, glib, gtk3, dbus-glib , glib, gtk3, dbus-glib
, glibc , glibc
, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL , libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups , protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core , ffmpeg, libxslt, libxml2, at-spi2-core
, jdk , jdk
@ -123,7 +123,7 @@ let
utillinux alsaLib utillinux alsaLib
bison gperf kerberos bison gperf kerberos
glib gtk3 dbus-glib glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libGLU_combined libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core pciutils protobuf speechd libXdamage at-spi2-core
jdk.jre jdk.jre
] ++ optional gnomeKeyringSupport libgnome-keyring3 ] ++ optional gnomeKeyringSupport libgnome-keyring3

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

@ -32,7 +32,7 @@
, libgnomeui , libgnomeui
, libnotify , libnotify
, gnome3 , gnome3
, libGLU_combined , libGLU, libGL
, nspr , nspr
, nss , nss
, pango , pango
@ -126,7 +126,7 @@ stdenv.mkDerivation {
libgnome libgnome
libgnomeui libgnomeui
libnotify libnotify
libGLU_combined libGLU libGL
nspr nspr
nss nss
pango pango

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

@ -7,7 +7,7 @@
{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify , freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip, makeWrapper , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification, libvpx , hunspell, libXdamage, libevent, libstartup_notification, libvpx
, icu, libpng, jemalloc, glib , icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages , autoconf213, which, gnused, cargo, rustc, llvmPackages
@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
gtk2 perl zip libIDL libjpeg zlib bzip2 gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
libnotify xorg.pixman yasm libGLU_combined libnotify xorg.pixman yasm libGLU libGL
xorg.libXScrnSaver xorg.xorgproto xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip makeWrapper xorg.libXext sqlite unzip makeWrapper
libevent libstartup_notification libvpx /* cairo */ libevent libstartup_notification libvpx /* cairo */

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

@ -3,7 +3,7 @@
, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, libnotify, libstartup_notification, makeWrapper , libnotify, libstartup_notification, makeWrapper
, libGLU_combined, perl, python, libpulseaudio , libGLU, libGL, perl, python, libpulseaudio
, unzip, xorg, wget, which, yasm, zip, zlib , unzip, xorg, wget, which, yasm, zip, zlib
}: }:
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype
gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify
libstartup_notification makeWrapper libGLU_combined perl libstartup_notification makeWrapper libGLU libGL perl
pkgconfig python libpulseaudio unzip wget which yasm zip zlib pkgconfig python libpulseaudio unzip wget which yasm zip zlib
] ++ (with xorg; [ ] ++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver libX11 libXext libXft libXi libXrender libXScrnSaver

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

@ -1,6 +1,6 @@
{fetchurl, stdenv, dpkg, makeWrapper, {fetchurl, stdenv, dpkg, makeWrapper,
alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap,
libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -32,7 +32,7 @@ stdenv.mkDerivation {
libpulseaudio libpulseaudio
libxml2 libxml2
libxslt libxslt
libGLU_combined libGLU libGL
nspr nspr
nss nss
openssl openssl

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

@ -34,7 +34,7 @@
, libgnome , libgnome
, libgnomeui , libgnomeui
, gnome3 , gnome3
, libGLU_combined , libGLU, libGL
, nspr , nspr
, nss , nss
, pango , pango
@ -116,7 +116,7 @@ stdenv.mkDerivation {
libcanberra-gtk2 libcanberra-gtk2
libgnome libgnome
libgnomeui libgnomeui
libGLU_combined libGLU libGL
nspr nspr
nss nss
pango pango

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

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs
, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify , freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, zip, unzip , yasm, libGLU, libGL, sqlite, zip, unzip
, libevent, libstartup_notification , libevent, libstartup_notification
, icu, libpng, jemalloc , icu, libpng, jemalloc
, autoconf213, which, m4, fetchpatch , autoconf213, which, m4, fetchpatch
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
[ gtk2 zip libIDL libjpeg zlib bzip2 [ gtk2 zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi dbus dbus-glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
nspr nss libnotify xorg.pixman yasm libGLU_combined nspr nss libnotify xorg.pixman yasm libGLU libGL
xorg.libXScrnSaver xorg.xorgproto xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip xorg.libXext sqlite unzip
libevent libstartup_notification /* cairo */ libevent libstartup_notification /* cairo */

4
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem { stdenv, fetchurl, makeWrapper, makeDesktopItem
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg
, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome , lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome
, pulseaudio }: , pulseaudio }:
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
gnome2.gtkglext libGLU_combined freetype fontconfig gnome2.gtkglext libGLU libGL freetype fontconfig
pangox_compat polkit polkit_gnome pulseaudio pangox_compat polkit polkit_gnome pulseaudio
] ++ (with xorg; [ ] ++ (with xorg; [
libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient , librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -365,7 +365,7 @@ in stdenv.mkDerivation rec {
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient gst_all_1.gst-plugins-base glib libmysqlclient
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sane-backends unzip vigra which zip zlib python3 sane-backends unzip vigra which zip zlib

4
pkgs/applications/office/libreoffice/still.nix
View File

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient , librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -362,7 +362,7 @@ in stdenv.mkDerivation rec {
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient gst_all_1.gst-plugins-base glib libmysqlclient
neon nspr nss openldap openssl ORBit2 pam perl poppler neon nspr nss openldap openssl ORBit2 pam perl poppler
python3 sane-backends unzip vigra which zip zlib python3 sane-backends unzip vigra which zip zlib

4
pkgs/applications/office/zotero/default.nix
View File

@ -25,7 +25,7 @@
, libXt , libXt
, libnotify , libnotify
, gnome3 , gnome3
, libGLU_combined , libGLU, libGL
, nspr , nspr
, nss , nss
, pango , pango
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
libXrender libXrender
libXt libXt
libnotify libnotify
libGLU_combined libGLU libGL
nspr nspr
nss nss
pango pango

4
pkgs/applications/science/astronomy/celestia/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
, lua, libGLU_combined, pkgconfig, perl, autoreconfHook , lua, libGLU, libGL, pkgconfig, perl, autoreconfHook
}: }:
let let
@ -44,7 +44,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua
perl autoreconfHook ]; perl autoreconfHook ];
patchPhase = '' patchPhase = ''

4
pkgs/applications/science/astronomy/gravit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }: { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gravit-0.5.1"; name = "gravit-0.5.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
}; };
buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake ];

4
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub { mkDerivation, lib, fetchFromGitHub
, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv , cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv
, qtscript, qtserialport, qttools , qtscript, qtserialport, qttools
, qtmultimedia, qtlocation, qtbase, wrapQtAppsHook , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook
}: }:
@ -18,7 +18,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
buildInputs = [ buildInputs = [
freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools
qtmultimedia qtlocation qtbase qtmultimedia qtlocation qtbase
]; ];

6
pkgs/applications/science/chemistry/avogadro/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }: { stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "avogadro-1.1.1"; name = "avogadro-1.1.1";
@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
}; };
buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ]; buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ];
nativeBuildInputs = [ cmake pkgconfig doxygen ]; nativeBuildInputs = [ cmake pkgconfig doxygen ];
NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h"; NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h";
patches = [ patches = [
(fetchurl { (fetchurl {

4
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -1,4 +1,4 @@
{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU_combined, zlib { wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU, libGL, zlib
, 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
, wrapGAppsHook , wrapGAppsHook
@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ pythonPackages.wxPython ]; propagatedBuildInputs = [ pythonPackages.wxPython ];
buildInputs = [ buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs libGLU libGL zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
cairo curl openssl boost cairo curl openssl boost
swig (python.withPackages (ps: with ps; [ wxPython ])) swig (python.withPackages (ps: with ps; [ wxPython ]))
] ++ optional (oceSupport) opencascade ] ++ optional (oceSupport) opencascade

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

@ -1,4 +1,4 @@
{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib { wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib
, 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
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig ]; nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [ buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost cairo curl openssl boost
] ++ optional (oceSupport) opencascade ] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice ++ optional (ngspiceSupport) libngspice

4
pkgs/applications/science/electronics/pcb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex { stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined , netpbm, imagemagick, dbus, xlibsWrapper, libGLU, libGL
, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg , shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
libGLU_combined tcl shared-mime-info tk libGLU libGL tcl shared-mime-info tk
gnome2.gtkglext pangox_compat gd xorg.libXmu gnome2.gtkglext pangox_compat gd xorg.libXmu
]; ];

4
pkgs/applications/science/logic/mcrl2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}: {stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "201707"; version = "201707";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
}; };
buildInputs = [ cmake libGLU_combined qt5.qtbase boost ]; buildInputs = [ cmake libGLU libGL qt5.qtbase boost ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/applications/science/math/giac/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack { stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty , gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty
, readline, gettext, libpng, libao, gfortran, perl , readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null , enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null
}: }:
assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${attr}-${version}"; name = "${attr}-${version}";
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.getLib gfortran.cc) (stdenv.lib.getLib gfortran.cc)
liblapack liblapack
] ++ stdenv.lib.optionals enableGUI [ ] ++ stdenv.lib.optionals enableGUI [
libGLU_combined fltk xorg.libX11 libGL libGLU fltk xorg.libX11
]; ];
/* fixes: /* fixes:

4
pkgs/applications/science/math/glsurf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut { stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut
, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib , libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
}: }:
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
}; };
buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr gmp
libtiff libjpeg libpng giflib ] libtiff libjpeg libpng giflib ]
++ (with ocamlPackages; [ ++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl

4
pkgs/applications/science/math/gmsh/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg, opencascade-occt }: , zlib, libGL, libGLU, xorg, opencascade-occt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gmsh"; pname = "gmsh";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45"; sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45";
}; };
buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
opencascade-occt opencascade-occt

4
pkgs/applications/science/medicine/aliza/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }: { stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -27,7 +27,7 @@ stdenv.mkDerivation {
''; '';
postInstall = let postInstall = let
libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ]; libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ];
in '' in ''
${patchelf}/bin/patchelf \ ${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

4
pkgs/applications/science/misc/boinc/default.nix
View File

@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl,
libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
let let
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
buildInputs = [ buildInputs = [
curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver
libnotify patchelf libX11 libxcb xcbutil libnotify patchelf libX11 libxcb xcbutil
]; ];

4
pkgs/applications/science/misc/golly/beta.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchgit {stdenv, fetchgit
, wxGTK, perl, python2, zlib, libGLU_combined, libX11 , wxGTK, perl, python2, zlib, libGLU, libGL, libX11
, automake, autoconf , automake, autoconf
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [autoconf automake]; nativeBuildInputs = [autoconf automake];
buildInputs = [ buildInputs = [
wxGTK perl python2 zlib libGLU_combined libX11 wxGTK perl python2 zlib libGLU libGL libX11
]; ];
# Link against Python explicitly as it is needed for scripts # Link against Python explicitly as it is needed for scripts

4
pkgs/applications/science/misc/gplates/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal { stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal_1_11, cgal
, proj, boost, cmake, python2, doxygen, graphviz, gmp }: , proj, boost, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2 qt4 qwt6_qt4 libGLU libGL glew gdal_1_11 cgal proj boost cmake python2
doxygen graphviz gmp doxygen graphviz gmp
]; ];

4
pkgs/applications/science/misc/root/5.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lzma, gsl_1
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ] buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;

4
pkgs/applications/science/misc/root/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2 { stdenv, fetchurl, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl, xxHash
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;

4
pkgs/applications/science/misc/tulip/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 { fetchurl, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4
, cmake, makeWrapper, libjpeg, python }: , cmake, makeWrapper, libjpeg, python }:
let version = "5.2.1"; in let version = "5.2.1"; in
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
}; };
buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ];
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];

4
pkgs/applications/science/misc/vite/default.nix
View File

@ -1,4 +1,4 @@
{ fetchsvn, stdenv, cmake, qt4, libGLU_combined }: { fetchsvn, stdenv, cmake, qt4, libGLU, libGL }:
# ViTE 1.1 has several bugs, so use the SVN version. # ViTE 1.1 has several bugs, so use the SVN version.
let let
@ -23,7 +23,7 @@ stdenv.mkDerivation {
ln -sv "${externals}" externals ln -sv "${externals}" externals
''; '';
buildInputs = [ cmake qt4 libGLU_combined ]; buildInputs = [ cmake qt4 libGLU libGL ];
NIX_LDFLAGS = "-lGLU"; NIX_LDFLAGS = "-lGLU";

2
pkgs/applications/version-management/bcompare/default.nix
View File

@ -1,4 +1,4 @@
{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }: { autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bcompare"; pname = "bcompare";

4
pkgs/applications/version-management/gource/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
, SDL2_image, freetype, glew, libGLU_combined, boost, glm , SDL2_image, freetype, glew, libGLU, libGL, boost, glm
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL
boost glm freetype boost glm freetype
]; ];

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

@ -1,7 +1,7 @@
{ config, stdenv, fetchurl { config, stdenv, fetchurl
, libX11, wxGTK , libX11, wxGTK
, libiconv, fontconfig, freetype , libiconv, fontconfig, freetype
, libGLU_combined , libGLU, libGL
, libass, fftw, ffms , libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, icu, boost, intltool # New dependencies , icu, boost, intltool # New dependencies
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp";
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU libGL
libass fftw ffms ffmpeg zlib icu boost boost.out libiconv libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
] ]
++ optional spellcheckSupport hunspell ++ optional spellcheckSupport hunspell

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

@ -1,6 +1,6 @@
{ config, stdenv, fetchFromGitHub { config, stdenv, fetchFromGitHub
, fetchpatch, pkgconfig, perl, python, which , fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, libGLU_combined , libX11, libxcb, libGLU, libGL
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, libchardet , libchardet
, ffmpeg , ffmpeg
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ libX11 [ libX11
libxcb libxcb
libGLU_combined libGLU libGL
qtbase qtbase
qtx11extras qtx11extras
qtdeclarative qtdeclarative

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

@ -2,7 +2,7 @@
, aalibSupport ? true, aalib ? null , aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null , fribidiSupport ? true, fribidi ? null
, x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? null , x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null
, xineramaSupport ? true, libXinerama ? null , xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null , xvSupport ? true, libXv ? null
, alsaSupport ? stdenv.isLinux, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
@ -32,7 +32,7 @@
assert fontconfigSupport -> (fontconfig != null); assert fontconfigSupport -> (fontconfig != null);
assert (!fontconfigSupport) -> (freefont_ttf != null); assert (!fontconfigSupport) -> (freefont_ttf != null);
assert fribidiSupport -> (fribidi != null); assert fribidiSupport -> (fribidi != null);
assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null); assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null);
assert xineramaSupport -> (libXinerama != null && x11Support); assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support); assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
++ optional aalibSupport aalib ++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi ++ optional fribidiSupport fribidi
++ optionals x11Support [ libX11 libXext libGLU_combined ] ++ optionals x11Support [ libX11 libXext libGLU libGL ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional xvSupport libXv ++ optional xvSupport libXv
++ optional theoraSupport libtheora ++ optional theoraSupport libtheora

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

@ -9,7 +9,7 @@
, libxkbcommon ? null , libxkbcommon ? null
, x11Support ? stdenv.isLinux , x11Support ? stdenv.isLinux
, libGLU_combined ? null , libGLU, libGL ? null
, libX11 ? null , libX11 ? null
, libXext ? null , libXext ? null
, libXxf86vm ? null , libXxf86vm ? null
@ -86,7 +86,7 @@ assert vapoursynthSupport -> available vapoursynth;
assert vdpauSupport -> available libvdpau; assert vdpauSupport -> available libvdpau;
assert vulkanSupport -> all available [ libplacebo shaderc vulkan-headers vulkan-loader ]; assert vulkanSupport -> all available [ libplacebo shaderc vulkan-headers vulkan-loader ];
assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ]; assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ];
assert x11Support -> all available [ libGLU_combined libX11 libXext libXxf86vm libXrandr ]; assert x11Support -> all available [ libGLU libGL libX11 libXext libXxf86vm libXrandr ];
assert xineramaSupport -> x11Support && available libXinerama; assert xineramaSupport -> x11Support && available libXinerama;
assert xvSupport -> x11Support && available libXv; assert xvSupport -> x11Support && available libXv;
assert youtubeSupport -> available youtube-dl; assert youtubeSupport -> available youtube-dl;
@ -181,7 +181,7 @@ in stdenv.mkDerivation rec {
++ optionals drmSupport [ libdrm mesa ] ++ optionals drmSupport [ libdrm mesa ]
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Cocoa CoreAudio CoreFoundation Cocoa CoreAudio

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

@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper { stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype
, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
, libXNVCtrl, enableXnvctrl ? false , libXNVCtrl, enableXnvctrl ? false
@ -26,7 +26,7 @@ mkDerivation rec {
setSourceRoot = ''sourceRoot=$(echo */mythtv)''; setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
buildInputs = [ buildInputs = [
freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl; ] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl;

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

@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras { stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja , libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja
}: }:
mkDerivation rec { mkDerivation rec {
@ -25,7 +25,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja ]; nativeBuildInputs = [ pkgconfig cmake ninja ];
buildInputs = [ buildInputs = [
alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU libGL
libpulseaudio qtbase qtx11extras libpulseaudio qtbase qtx11extras
]; ];

4
pkgs/applications/virtualization/bochs/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig, libtool , pkgconfig, libtool
, gtk2, libGLU_combined, readline, libX11, libXpm , gtk2, libGLU, libGL, readline, libX11, libXpm
, docbook_xml_dtd_45, docbook_xsl , docbook_xml_dtd_45, docbook_xsl
, sdlSupport ? true, SDL2 ? null , sdlSupport ? true, SDL2 ? null
, termSupport ? true, ncurses ? null , termSupport ? true, ncurses ? null
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; patches = [ ./bochs-2.6.9-glibc-2.26.patch ];
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
++ optionals termSupport [ ncurses ] ++ optionals termSupport [ ncurses ]
++ optionals sdlSupport [ SDL2 ] ++ optionals sdlSupport [ SDL2 ]
++ optionals wxSupport [ wxGTK ] ++ optionals wxSupport [ wxGTK ]

6
pkgs/data/misc/tzdata/default.nix
View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tzdata"; pname = "tzdata";
version = "2019b"; version = "2019c";
srcs = srcs =
[ (fetchurl { [ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"; sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr";
}) })
(fetchurl { (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"; sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn";
}) })
]; ];

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

@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
gnome_vfs = callPackage ./platform/gnome-vfs { gnome_vfs = callPackage ./platform/gnome-vfs { };
openssl = pkgs.openssl_1_0_2;
};
libgnome = callPackage ./platform/libgnome { }; libgnome = callPackage ./platform/libgnome { };

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib
, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,6 +20,18 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ GConf glib ]; propagatedBuildInputs = [ GConf glib ];
# struct SSL is opaque in openssl-1.1; and the SSL_free() man page
# says that one should not free members of it manually (in both
# the openssl-1.0 and openssl-1.1 man pages).
# https://bugs.gentoo.org/592540
patches = [ (fetchpatch {
name = "gnome-vfs-2.24.4-openssl-1.1.patch";
url = "https://bugs.gentoo.org/attachment.cgi?id=535944";
sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040";
extraPrefix = "";
})
];
postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
doCheck = false; # needs dbus daemon doCheck = false; # needs dbus daemon

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU_combined, pango, pangox_compat, xorg }: { stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU, libGL, pango, pangox_compat, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkglext-1.2.0"; name = "gtkglext-1.2.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with xorg; buildInputs = with xorg;
[ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ]; [ pkgconfig glib gtk2 libGLU libGL pango libX11 libXmu ];
propagatedBuildInputs = [ pangox_compat ]; propagatedBuildInputs = [ pangox_compat ];
patches = [ patches = [

12
pkgs/development/compilers/vala/default.nix
View File

@ -106,18 +106,18 @@ in rec {
}; };
vala_0_40 = generic { vala_0_40 = generic {
version = "0.40.16"; version = "0.40.18";
sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; sha256 = "1f7cdkjdysg4dcri1wbzdddm46amk2s48jkwb5ghpdvhjb4l5j2m";
}; };
vala_0_44 = generic { vala_0_44 = generic {
version = "0.44.8"; version = "0.44.11";
sha256 = "0f7pc496zvxfhbkhg8ayxykjas6f55mgv452wsnh0bz5zbxm8xrl"; sha256 = "06spdvm9q9k4riq1d2fxkyc8d88bcv460v360465iy1lnj3z9x2s";
}; };
vala_0_46 = generic { vala_0_46 = generic {
version = "0.46.2"; version = "0.46.5";
sha256 = "1g20fzcwh3j7ab46jalabyi005h2in0cp7xj0yga4b8hx29h61wj"; sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s";
}; };
vala = vala_0_46; vala = vala_0_46;

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

@ -259,7 +259,7 @@ self: super: builtins.intersectAttrs super {
wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
# Test suite wants to connect to $DISPLAY. # Test suite wants to connect to $DISPLAY.
hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.libGLU_combined); hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
# Tests attempt to use NPM to install from the network into # Tests attempt to use NPM to install from the network into
# /homeless-shelter. Disabled. # /homeless-shelter. Disabled.

138
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -1438,7 +1438,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) db; inherit (pkgs) dbxml; }) {inherit (pkgs) db; inherit (pkgs) dbxml;
inherit (pkgs) xercesc; inherit (pkgs) xqilla;}; inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
"BerlekampAlgorithm" = callPackage "BerlekampAlgorithm" = callPackage
@ -2631,10 +2631,10 @@ self: {
license = "GPL"; license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {opencv_calib3d = null; opencv_contrib = null; }) {opencv_calib3d = null; opencv_contrib = null;
opencv_core = null; opencv_features2d = null; opencv_flann = null; opencv_core = null; opencv_features2d = null; opencv_flann = null;
opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null;
opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; opencv_legacy = null; opencv_ml = null; opencv_objdetect = null;
opencv_video = null;}; opencv_video = null;};
"Cabal_2_2_0_1" = callPackage "Cabal_2_2_0_1" = callPackage
@ -6466,7 +6466,7 @@ self: {
librarySystemDepends = [ libGL libX11 libXext libXfixes ]; librarySystemDepends = [ libGL libX11 libXext libXfixes ];
description = "A Haskell binding for GLFW"; description = "A Haskell binding for GLFW";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;}; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
"GLFW-OGL" = callPackage "GLFW-OGL" = callPackage
@ -7829,7 +7829,7 @@ self: {
license = "LGPL"; license = "LGPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {mysqlclient = null; inherit (pkgs) openssl; }) {mysqlclient = null; inherit (pkgs) openssl;
inherit (pkgs) zlib;}; inherit (pkgs) zlib;};
"HDBC-odbc" = callPackage "HDBC-odbc" = callPackage
@ -8133,7 +8133,7 @@ self: {
description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings"; description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {CEGUIBase = null; CEGUIOgreRenderer = null; }) {CEGUIBase = null; CEGUIOgreRenderer = null;
hg3dcegui050 = null;}; hg3dcegui050 = null;};
"HGamer3D-Common" = callPackage "HGamer3D-Common" = callPackage
@ -8285,8 +8285,8 @@ self: {
description = "Ogre Binding for HGamer3D"; description = "Ogre Binding for HGamer3D";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {OgreMain = null; OgrePaging = null; OgreProperty = null; }) {OgreMain = null; OgrePaging = null; OgreProperty = null;
OgreRTShaderSystem = null; OgreTerrain = null; OgreRTShaderSystem = null; OgreTerrain = null;
hg3dogre050 = null;}; hg3dogre050 = null;};
"HGamer3D-SDL2-Binding" = callPackage "HGamer3D-SDL2-Binding" = callPackage
@ -8304,7 +8304,7 @@ self: {
description = "SDL2 Binding for HGamer3D"; description = "SDL2 Binding for HGamer3D";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) SDL2; hg3dsdl2050 = null; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null;
inherit (pkgs.xorg) libX11;}; inherit (pkgs.xorg) libX11;};
"HGamer3D-SFML-Binding" = callPackage "HGamer3D-SFML-Binding" = callPackage
@ -8322,7 +8322,7 @@ self: {
description = "SFML Binding for HGamer3D"; description = "SFML Binding for HGamer3D";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null;
sfml-system = null; sfml-window = null;}; sfml-system = null; sfml-window = null;};
"HGamer3D-WinEvent" = callPackage "HGamer3D-WinEvent" = callPackage
@ -14555,8 +14555,8 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {comctl32 = null; comdlg32 = null; gdi32 = null; }) {comctl32 = null; comdlg32 = null; gdi32 = null;
kernel32 = null; ole32 = null; shell32 = null; user32 = null; kernel32 = null; ole32 = null; shell32 = null; user32 = null;
winmm = null; winspool = null;}; winmm = null; winspool = null;};
"ObjectName" = callPackage "ObjectName" = callPackage
@ -17169,9 +17169,9 @@ self: {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {csfml-audio = null; csfml-graphics = null; }) {csfml-audio = null; csfml-graphics = null;
csfml-network = null; csfml-system = null; csfml-window = null; csfml-network = null; csfml-system = null; csfml-window = null;
sfml-audio = null; sfml-graphics = null; sfml-network = null; sfml-audio = null; sfml-graphics = null; sfml-network = null;
sfml-system = null; sfml-window = null;}; sfml-system = null; sfml-window = null;};
"SFML-control" = callPackage "SFML-control" = callPackage
@ -20735,8 +20735,8 @@ self: {
]; ];
description = "A binding to the X11 graphics library"; description = "A binding to the X11 graphics library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver;
inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
"X11-extras" = callPackage "X11-extras" = callPackage
@ -34059,7 +34059,7 @@ self: {
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {aviation-cessna172-weight-balance = null; }) {aviation-cessna172-weight-balance = null;
aviation-units = null; aviation-weight-balance = null;}; aviation-units = null; aviation-weight-balance = null;};
"avl-static" = callPackage "avl-static" = callPackage
@ -37865,7 +37865,7 @@ self: {
license = "LGPL"; license = "LGPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {leksah-dummy = null; leksah-main = null; }) {leksah-dummy = null; leksah-main = null;
leksah-plugin-pane = null;}; leksah-plugin-pane = null;};
"billeksah-pane" = callPackage "billeksah-pane" = callPackage
@ -38649,10 +38649,10 @@ self: {
]; ];
description = "Low-level bindings to GLFW OpenGL library"; description = "Low-level bindings to GLFW OpenGL library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext;
inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi;
inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXxf86vm;}; inherit (pkgs.xorg) libXxf86vm;};
"bindings-GLFW_3_3_0_0" = callPackage "bindings-GLFW_3_3_0_0" = callPackage
@ -38675,10 +38675,10 @@ self: {
description = "Low-level bindings to GLFW OpenGL library"; description = "Low-level bindings to GLFW OpenGL library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext;
inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi;
inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXxf86vm;}; inherit (pkgs.xorg) libXxf86vm;};
"bindings-K8055" = callPackage "bindings-K8055" = callPackage
@ -63174,7 +63174,7 @@ self: {
description = "A raw binding for the directX 11"; description = "A raw binding for the directX 11";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.none; platforms = stdenv.lib.platforms.none;
}) {D3DCompiler = null; d3d11 = null; d3dx11 = null; }) {D3DCompiler = null; d3d11 = null; d3dx11 = null;
d3dxof = null; dxgi = null; dxguid = null;}; d3dxof = null; dxgi = null; dxguid = null;};
"d3js" = callPackage "d3js" = callPackage
@ -63483,7 +63483,7 @@ self: {
license = "GPL"; license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) curl; inherit (pkgs) ncurses; }) {inherit (pkgs) curl; inherit (pkgs) ncurses;
inherit (pkgs) zlib;}; inherit (pkgs) zlib;};
"darcs-fastconvert" = callPackage "darcs-fastconvert" = callPackage
@ -83790,7 +83790,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null;
libavformat = null; libswscale = null;}; libavformat = null; libswscale = null;};
"ffmpeg-tutorials" = callPackage "ffmpeg-tutorials" = callPackage
@ -86211,7 +86211,7 @@ self: {
]; ];
description = "FLTK bindings"; description = "FLTK bindings";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) fltk14; inherit (pkgs) libGL; }) {inherit (pkgs) fltk14; inherit (pkgs) libGL;
inherit (pkgs) libGLU; inherit (pkgs) pkg-config;}; inherit (pkgs) libGLU; inherit (pkgs) pkg-config;};
"fltkhs-demos" = callPackage "fltkhs-demos" = callPackage
@ -88367,7 +88367,7 @@ self: {
description = "Interface to the Kinect device"; description = "Interface to the Kinect device";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) freenect; freenect_sync = null; }) {inherit (pkgs) freenect; freenect_sync = null;
libfreenect = null;}; libfreenect = null;};
"freer" = callPackage "freer" = callPackage
@ -90919,9 +90919,9 @@ self: {
]; ];
description = "A Haskell binding to a subset of the GD graphics library"; description = "A Haskell binding to a subset of the GD graphics library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) expat; inherit (pkgs) fontconfig; }) {inherit (pkgs) expat; inherit (pkgs) fontconfig;
inherit (pkgs) freetype; inherit (pkgs) gd; inherit (pkgs) freetype; inherit (pkgs) gd;
inherit (pkgs) libjpeg; inherit (pkgs) libpng; inherit (pkgs) libjpeg; inherit (pkgs) libpng;
inherit (pkgs) zlib;}; inherit (pkgs) zlib;};
"gdax" = callPackage "gdax" = callPackage
@ -96222,9 +96222,9 @@ self: {
description = "manage files with git, without checking their contents into git"; description = "manage files with git, without checking their contents into git";
license = stdenv.lib.licenses.agpl3; license = stdenv.lib.licenses.agpl3;
maintainers = with stdenv.lib.maintainers; [ peti ]; maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git;
inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh;
inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget;
inherit (pkgs) which;}; inherit (pkgs) which;};
"git-brunch" = callPackage "git-brunch" = callPackage
@ -98310,7 +98310,7 @@ self: {
libraryToolDepends = [ c2hs ]; libraryToolDepends = [ c2hs ];
description = "Bindings for libgnome-keyring"; description = "Bindings for libgnome-keyring";
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
}) {inherit (pkgs.gnome3) gnome-keyring; }) {inherit (pkgs.gnome3) gnome-keyring;
inherit (pkgs) libgnome-keyring;}; inherit (pkgs) libgnome-keyring;};
"gnomevfs" = callPackage "gnomevfs" = callPackage
@ -102662,7 +102662,7 @@ self: {
executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ];
description = "Simple clipboard manager to be integrated with rofi"; description = "Simple clipboard manager to be integrated with rofi";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null;
inherit (pkgs) xlibsWrapper;}; inherit (pkgs) xlibsWrapper;};
"greg-client" = callPackage "greg-client" = callPackage
@ -104031,9 +104031,9 @@ self: {
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext;
inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE;
inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu;
inherit (pkgs.xorg) libXt;}; inherit (pkgs.xorg) libXt;};
"gtkimageview" = callPackage "gtkimageview" = callPackage
@ -104421,7 +104421,7 @@ self: {
license = "LGPL"; license = "LGPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {cudd = null; epd = null; inherit (pkgs) mtr; }) {cudd = null; epd = null; inherit (pkgs) mtr;
inherit (pkgs) st; util = null;}; inherit (pkgs) st; util = null;};
"hCM" = callPackage "hCM" = callPackage
@ -116325,7 +116325,7 @@ self: {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {newrelic-collector-client = null; newrelic-common = null; }) {newrelic-collector-client = null; newrelic-common = null;
newrelic-transaction = null;}; newrelic-transaction = null;};
"helics-wai" = callPackage "helics-wai" = callPackage
@ -117728,7 +117728,7 @@ self: {
description = "File/folder watching for OS X"; description = "File/folder watching for OS X";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = [ "x86_64-darwin" ]; platforms = [ "x86_64-darwin" ];
}) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;};
"hfusion" = callPackage "hfusion" = callPackage
@ -123244,7 +123244,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) freeglut; inherit (pkgs) libGL; }) {inherit (pkgs) freeglut; inherit (pkgs) libGL;
inherit (pkgs) libGLU;}; inherit (pkgs) libGLU;};
"hp2any-manager" = callPackage "hp2any-manager" = callPackage
@ -124426,7 +124426,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {brotlidec = null; brotlienc = null; libbrotlidec = null; }) {brotlidec = null; brotlienc = null; libbrotlidec = null;
libbrotlienc = null;}; libbrotlienc = null;};
"hs-captcha" = callPackage "hs-captcha" = callPackage
@ -126618,7 +126618,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) blas; inherit (pkgs) gsl; }) {inherit (pkgs) blas; inherit (pkgs) gsl;
inherit (pkgs) liblapack;}; inherit (pkgs) liblapack;};
"hsilop" = callPackage "hsilop" = callPackage
@ -127001,10 +127001,10 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null;
inherit (pkgs) jasper; inherit (pkgs) lcms; inherit (pkgs) jasper; inherit (pkgs) lcms;
inherit (pkgs) libjpeg; inherit (pkgs) libpng; inherit (pkgs) libjpeg; inherit (pkgs) libpng;
inherit (pkgs) libxml2; tiff = null; wmflite = null; inherit (pkgs) libxml2; tiff = null; wmflite = null;
inherit (pkgs) zlib;}; inherit (pkgs) zlib;};
"hsmisc" = callPackage "hsmisc" = callPackage
@ -128857,7 +128857,7 @@ self: {
license = "GPL"; license = "GPL";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) ncurses; inherit (pkgs) readline; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;
swipl = null;}; swipl = null;};
"hsx" = callPackage "hsx" = callPackage
@ -152356,7 +152356,7 @@ self: {
description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ]; maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) git; inherit (pkgs) nettools; }) {inherit (pkgs) git; inherit (pkgs) nettools;
inherit (pkgs) ocaml; inherit (pkgs) z3;}; inherit (pkgs) ocaml; inherit (pkgs) z3;};
"liquidhaskell" = callPackage "liquidhaskell" = callPackage
@ -164616,7 +164616,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {gecodeint = null; gecodekernel = null; gecodesearch = null; }) {gecodeint = null; gecodekernel = null; gecodesearch = null;
gecodeset = null; gecodesupport = null;}; gecodeset = null; gecodesupport = null;};
"monadio-unwrappable" = callPackage "monadio-unwrappable" = callPackage
@ -169176,7 +169176,7 @@ self: {
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL;
inherit (pkgs) libGLU;}; inherit (pkgs) libGLU;};
"nanovg-simple" = callPackage "nanovg-simple" = callPackage
@ -172811,7 +172811,7 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {g = null; inherit (pkgs) glib; libnm-glib = null; }) {g = null; inherit (pkgs) glib; libnm-glib = null;
nm-glib = null;}; nm-glib = null;};
"nme" = callPackage "nme" = callPackage
@ -175108,8 +175108,8 @@ self: {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;
inherit (pkgs.xorg) libXinerama; ovr = null; inherit (pkgs.xorg) libXinerama; ovr = null;
inherit (pkgs) systemd;}; inherit (pkgs) systemd;};
"odbc" = callPackage "odbc" = callPackage
@ -188448,7 +188448,7 @@ self: {
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2;
inherit (pkgs) pango; inherit (pkgs) poppler;}; inherit (pkgs) pango; inherit (pkgs) poppler;};
"populate-setup-exe-cache" = callPackage "populate-setup-exe-cache" = callPackage
@ -195680,7 +195680,7 @@ self: {
description = "Qt bindings"; description = "Qt bindings";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {qtc_core = null; qtc_gui = null; qtc_network = null; }) {qtc_core = null; qtc_gui = null; qtc_network = null;
qtc_opengl = null; qtc_script = null; qtc_tools = null;}; qtc_opengl = null; qtc_script = null; qtc_tools = null;};
"qtah-cpp-qt5" = callPackage "qtah-cpp-qt5" = callPackage
@ -231849,7 +231849,7 @@ self: {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx;
inherit (pkgs) symengine;}; inherit (pkgs) symengine;};
"symengine-hs" = callPackage "symengine-hs" = callPackage
@ -231869,7 +231869,7 @@ self: {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx;
inherit (pkgs) symengine;}; inherit (pkgs) symengine;};
"symmetric-properties" = callPackage "symmetric-properties" = callPackage
@ -236175,7 +236175,7 @@ self: {
description = "Terminal emulator configurable in Haskell"; description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
}) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2;
vte_291 = pkgs.vte;}; vte_291 = pkgs.vte;};
"termplot" = callPackage "termplot" = callPackage
@ -259448,7 +259448,7 @@ self: {
description = "wxHaskell C++ wrapper"; description = "wxHaskell C++ wrapper";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;
inherit (pkgs) wxGTK;}; inherit (pkgs) wxGTK;};
"wxcore" = callPackage "wxcore" = callPackage
@ -261272,7 +261272,7 @@ self: {
description = "A Minimalistic Text Based Status Bar"; description = "A Minimalistic Text Based Status Bar";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
"xmonad" = callPackage "xmonad" = callPackage

6
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -2,7 +2,7 @@
, libxml2, libxslt, ncurses, openssl, perl, autoconf , libxml2, libxslt, ncurses, openssl, perl, autoconf
, openjdk ? null # javacSupport , openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport , unixODBC ? null # odbcSupport
, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd , withSystemd ? stdenv.isLinux, systemd # systemd support in epmd
}: }:
@ -18,7 +18,7 @@
, enableKernelPoll ? true , enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ] , javacSupport ? false, javacPackages ? [ openjdk ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ] , odbcSupport ? false, odbcPackages ? [ unixODBC ]
, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? "" , preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
@ -32,7 +32,7 @@
assert wxSupport -> (if stdenv.isDarwin assert wxSupport -> (if stdenv.isDarwin
then wxmac != null then wxmac != null
else libGLU_combined != null && wxGTK != null && xorg != null); else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null; assert javacSupport -> openjdk != null;

4
pkgs/development/interpreters/io/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
zlib sqlite gmp libffi cairo ncurses freetype zlib sqlite gmp libffi cairo ncurses freetype
libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2 libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl freeglut libsamplerate pcre libevent libedit yajl
pkgconfig glfw openssl libpthreadstubs libXdmcp pkgconfig glfw openssl libpthreadstubs libXdmcp
libmemcached python3 libmemcached python3

4
pkgs/development/interpreters/love/0.10.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, { stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool libtheora, which, autoconf, automake, libtool
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake libvorbis libogg libtheora autoconf which libtool automake
]; ];

4
pkgs/development/interpreters/love/0.7.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, SDL, libGLU_combined, openal, lua , SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs , libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg , libmodplug, mpg123, libvorbis, libogg
, libmng , libmng
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL libGLU_combined openal lua SDL libGLU libGL openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
]; ];

4
pkgs/development/interpreters/love/0.8.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, SDL, libGLU_combined, openal, lua , SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs , libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg , libmodplug, mpg123, libvorbis, libogg
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL libGLU_combined openal lua SDL libGLU libGL openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libdevil freetype physfs libmodplug mpg123 libvorbis libogg
]; ];

4
pkgs/development/interpreters/love/0.9.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, SDL2, libGLU_combined, openal, luajit , SDL2, libGLU, libGL, openal, luajit
, libdevil, freetype, physfs , libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg , libmodplug, mpg123, libvorbis, libogg
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL2 libGLU_combined openal luajit SDL2 libGLU libGL openal luajit
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libdevil freetype physfs libmodplug mpg123 libvorbis libogg
]; ];

4
pkgs/development/interpreters/love/11.1.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, { stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool libtheora, which, autoconf, automake, libtool
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake libvorbis libogg libtheora autoconf which libtool automake
]; ];

4
pkgs/development/interpreters/lush/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU_combined, SDL {stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}: , blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
libX11 libSM xorgproto indent readline gsl freeglut libGLU_combined SDL blas libbfd libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd
intltool gettext zlib intltool gettext zlib
]; ];

2
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
View File

@ -229,6 +229,8 @@ def _determine_extension(text, fetcher):
raise ValueError("Don't know how to update a Flit package.") raise ValueError("Don't know how to update a Flit package.")
elif src_format == 'other': elif src_format == 'other':
raise ValueError("Don't know how to update a format='other' package.") raise ValueError("Don't know how to update a format='other' package.")
elif src_format == 'pyproject':
raise ValueError("Don't know how to update a pyproject package.")
extension = FORMATS[src_format] extension = FORMATS[src_format]
elif fetcher == 'fetchurl': elif fetcher == 'fetchurl':

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2 { stdenv, fetchurl, python2Packages, pkgconfig, SDL2
, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib , libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib
, glib , glib
}: }:
@ -32,13 +32,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
python cython wrapPython tkinter python cython wrapPython tkinter
SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
]; ];
pythonPath = [ pygame_sdl2 tkinter ]; pythonPath = [ pygame_sdl2 tkinter ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib
]); ]);
buildPhase = '' buildPhase = ''

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

@ -1,9 +1,9 @@
{ stdenv, fetchurl, unzip, xorg, libGLU_combined }: { stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "AntTweakBar-1.16"; name = "AntTweakBar-1.16";
buildInputs = [ unzip xorg.libX11 libGLU_combined ]; buildInputs = [ unzip xorg.libX11 libGLU libGL ];
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";

4
pkgs/development/libraries/allegro/5.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 { stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc , libXxf86dga, libXxf86misc
, libXxf86vm, openal, libGLU_combined, libjpeg, flac , libXxf86vm, openal, libGLU, libGL, libjpeg, flac
, libXi, libXfixes, freetype, libopus, libtheora , libXi, libXfixes, freetype, libopus, libtheora
, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
, libXdmcp , libXdmcp
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
libXxf86vm openal libGLU_combined libXxf86vm openal libGLU libGL
libjpeg flac libjpeg flac
libXi libXfixes libXi libXfixes
enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11 { stdenv, fetchurl, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc , libXxf86dga, libXxf86misc
, libXxf86vm, openal, libGLU_combined }: , libXxf86vm, openal, libGLU, libGL }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "allegro"; pname = "allegro";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
libXxf86vm openal libGLU_combined libXxf86vm openal libGLU libGL
]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
, cudatoolkit, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl , cudatoolkit, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl
, blas, openblas, boost, mesa, libGLU_combined , blas, openblas, boost, mesa, libGLU, libGL
, freeimage, python, clfft, clblas , freeimage, python, clfft, clblas
, doxygen, buildDocs ? false , doxygen, buildDocs ? false
}: }:
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
opencl-clhpp fftw fftwFloat opencl-clhpp fftw fftwFloat
mkl mkl
openblas openblas
libGLU_combined libGLU libGL
mesa freeimage mesa freeimage
boost.out boost.dev boost.out boost.dev
] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ]) ] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ])

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

@ -15,26 +15,20 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "aspell-0.60.6.1"; name = "aspell-0.60.8";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/aspell/${name}.tar.gz"; url = "mirror://gnu/aspell/${name}.tar.gz";
sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
}; };
patches = [ patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
(fetchpatch { # remove in >= 0.60.7
name = "gcc-7.patch";
url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff";
sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix";
})
] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
postPatch = '' postPatch = ''
patch interfaces/cc/aspell.h < ${./clang.patch} patch interfaces/cc/aspell.h < ${./clang.patch}
''; '';
nativeBuildInputs = [ perl ]; buildInputs = [ perl ];
doCheck = true; doCheck = true;

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xorgproto { stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
, libXi, pkgconfig }: , libXi, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
unzip cmake libGLU_combined freeglut libX11 xorgproto libXi unzip cmake libGLU libGL freeglut libX11 xorgproto libXi
]; ];
cmakeFlags = [ cmakeFlags = [

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut { stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
, Cocoa, OpenGL , Cocoa, OpenGL
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ]; patches = [ ./gwen-narrowing.patch ];

4
pkgs/development/libraries/bullet/roboschool-fork.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut { stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
, Cocoa, OpenGL , Cocoa, OpenGL
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ]; patches = [ ./gwen-narrowing.patch ];

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

@ -5,7 +5,7 @@
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
, libGL ? null # libGLU_combined is no longer a big dependency , libGL ? null # libGLU libGL is no longer a big dependency
, pdfSupport ? true , pdfSupport ? true
, darwin , darwin
}: }:

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xorgproto { stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
, libXi, libXmu , libXi, libXmu
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = buildInputs =
[ freeglut libGLU_combined glfw2 glew libX11 xorgproto libXi libXmu ]; [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu ];
postInstall = '' postInstall = ''
mkdir -p $out/bin mkdir -p $out/bin

6
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -104,7 +104,7 @@
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
#, opencv ? null # Video filtering #, opencv ? null # Video filtering
, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering , openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering
#, openh264 ? null # H.264/AVC encoder #, openh264 ? null # H.264/AVC encoder
, openjpeg ? null # JPEG 2000 de/encoder , openjpeg ? null # JPEG 2000 de/encoder
, opensslExtlib ? false, openssl ? null , opensslExtlib ? false, openssl ? null
@ -234,7 +234,7 @@ assert gnutls != null -> !opensslExtlib;
assert libxcbshmExtlib -> libxcb != null; assert libxcbshmExtlib -> libxcb != null;
assert libxcbxfixesExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> libGLU_combined != null; assert openglExtlib -> libGL != null && libGLU != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -424,7 +424,7 @@ stdenv.mkDerivation rec {
libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
zeromq4 zlib zeromq4 zlib
] ++ optional openglExtlib libGLU_combined ] ++ optionals openglExtlib [ libGL libGLU ]
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf

6
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -2,7 +2,7 @@
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
, openglSupport ? false, libGLU_combined ? null , openglSupport ? false, libGLU ? null, libGL ? null
, libmfxSupport ? false, intel-media-sdk ? null , libmfxSupport ? false, intel-media-sdk ? null
, libaomSupport ? false, libaom ? null , libaomSupport ? false, libaom ? null
# Build options # Build options
@ -63,7 +63,7 @@ let
vpxSupport = reqMin "0.6" && !isAarch32; vpxSupport = reqMin "0.6" && !isAarch32;
in in
assert openglSupport -> libGLU_combined != null; assert openglSupport -> libGL != null && libGLU != null;
assert libmfxSupport -> intel-media-sdk != null; assert libmfxSupport -> intel-media-sdk != null;
assert libaomSupport -> libaom != null; assert libaomSupport -> libaom != null;
@ -168,7 +168,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
] ++ optional openglSupport libGLU_combined ] ++ optionals openglSupport [ libGL libGLU ]
++ optional libmfxSupport intel-media-sdk ++ optional libmfxSupport intel-media-sdk
++ optional vpxSupport libaom ++ optional vpxSupport libaom
++ optional vpxSupport libvpx ++ optional vpxSupport libvpx

4
pkgs/development/libraries/fltk/1.4.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
, libtiff, freetype, Cocoa, AGL, GLUT , libtiff, freetype, Cocoa, AGL, GLUT
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ] buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
propagatedBuildInputs = [ xorgproto ] propagatedBuildInputs = [ xorgproto ]

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig { stdenv, fetchFromGitHub, cmake, pkgconfig
, arrayfire, expat, fontconfig, freeimage, freetype, boost , arrayfire, expat, fontconfig, freeimage, freetype, boost
, mesa, libGLU_combined, glfw3, SDL2, cudatoolkit , mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
boost.dev boost.dev
freeimage freeimage
mesa mesa
libGLU_combined libGLU libGL
glfw3 glfw3
SDL2 SDL2
cudatoolkit cudatoolkit

4
pkgs/development/libraries/fox/fox-1.6.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
, libXrandr, libGLU_combined, libXft, libXfixes, xinput , libXrandr, libGLU, libGL, libXft, libXfixes, xinput
, CoreServices }: , CoreServices }:
let let
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
libXft libGLU_combined libXfixes xinput libXft libGLU libGL libXfixes xinput
] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
doCheck = true; doCheck = true;

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu { stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
, GLUT, Cocoa , GLUT, Cocoa
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6"; sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
}; };
buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ] buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ]
++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

8
pkgs/development/libraries/fribidi/default.nix
View File

@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das"; sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das";
}; };
patches = [
(fetchpatch {
name = "CVE-2019-18397.patch";
url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch";
sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8";
})
];
postPatch = '' postPatch = ''
patchShebangs test patchShebangs test
''; '';

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