Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1290ffdce0b1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 735ca8b841a1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 4, 2019

  1. Add dependency and patch files (refs: #65786)

    @ysndr
    ysndr committed Aug 4, 2019
    Copy the full SHA
    b74113e View commit details

Commits on Aug 6, 2019

  1. Merge pull request #65957 from ysndr/fix/love_0_7 

    Add dependency and patch files (refs: #65786)
    @7c6f434c
    7c6f434c authored Aug 6, 2019
    Copy the full SHA
    735ca8b View commit details
Showing with 26 additions and 1 deletion.
  1. +21 −0 pkgs/development/interpreters/love/0.7-gl-prototypes.patch
  2. +5 −1 pkgs/development/interpreters/love/0.7.nix
21 changes: 21 additions & 0 deletions pkgs/development/interpreters/love/0.7-gl-prototypes.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp
--- love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:46:55.032982224 -0400
+++ love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:47:22.356175299 -0400
@@ -1,3 +1,5 @@
+#define GL_GLEXT_PROTOTYPES
+
#include "Framebuffer.h"
#include <common/Matrix.h>

diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp
--- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:46:55.032982224 -0400
+++ love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:47:33.346119890 -0400
@@ -18,6 +18,8 @@
* 3. This notice may not be removed or altered from any source distribution.
**/

+#define GL_GLEXT_PROTOTYPES
+
#include "SpriteBatch.h"

// STD
6 changes: 5 additions & 1 deletion pkgs/development/interpreters/love/0.7.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, SDL, libGLU_combined, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
, libmng
}:

stdenv.mkDerivation rec {
@@ -11,10 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
};

# see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
patches = [ ./0.7-gl-prototypes.patch ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL libGLU_combined openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
];

preConfigure = ''