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

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-10 16:44:34 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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; };
# 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
# /homeless-shelter. Disabled.

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

@@ -85987,7 +85987,7 @@ self: {
"fltkhs" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
, fltk14, libGLU_combined, mtl, OpenGLRaw, parsec, pkgconfig, text
, fltk14, libGLU, libGL, mtl, OpenGLRaw, parsec, pkgconfig, text
, vector
}:
mkDerivation {
@@ -86000,14 +86000,14 @@ self: {
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [ base bytestring text vector ];
librarySystemDepends = [ fltk14 ];
libraryPkgconfigDepends = [ libGLU_combined ];
libraryPkgconfigDepends = [ libGLU libGL ];
libraryToolDepends = [ c2hs pkgconfig ];
executableHaskellDepends = [
base directory filepath mtl OpenGLRaw parsec text
];
description = "FLTK bindings";
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined;
}) {inherit (pkgs) fltk14; inherit (pkgs) libGLU libGL;
pkgconfig = null;};
"fltkhs-demos" = callPackage