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

treewide: transition mesa to libGLU_combined

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:06:49 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/dosbox/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, SDL, makeDesktopItem, mesa }:
{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }:
stdenv.mkDerivation rec {
name = "dosbox-0.74";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ SDL mesa ];
buildInputs = [ SDL libGLU_combined ];
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
pkgs/misc/emulators/dosbox/unstable.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
let revision = "4025";
revisionDate = "2017-07-02";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ SDL SDL_net SDL_sound libpng mesa ];
buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ];
desktopItem = makeDesktopItem {
name = "dosbox";