pyrox.dev
glslviewer: 1.2 -> 2018-01-31, fixes build
+21
-11
pkgs/development/tools/glslviewer/default.nix
+21
-11
pkgs/development/tools/glslviewer/default.nix
···
1
1
{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
2
2
, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
3
-
, libX11, libGLU, Cocoa
3
+
, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook
4
+
, Cocoa
4
5
}:
5
6
6
7
stdenv.mkDerivation rec {
7
8
name = "glslviewer-${version}";
8
-
version = "1.2";
9
+
version = "2018-01-31";
9
10
10
11
src = fetchFromGitHub {
11
12
owner = "patriciogonzalezvivo";
12
13
repo = "glslViewer";
13
-
rev = version;
14
-
sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw";
14
+
rev = "cac40f6984dbeb638950744c9508aa88591fea6c";
15
+
sha256 = "1bykpp68hdxjlxvi1xicyb6822mz69q0adz24faaac372pls4bk0";
15
16
};
16
17
18
+
nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ];
19
+
buildInputs = [
20
+
glfw libGLU glfw libXrandr libXdamage
21
+
libXext libXrender libXinerama libXcursor libXxf86vm
22
+
libXi libX11
23
+
] ++ (with python2Packages; [ python setuptools wrapPython ])
24
+
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
25
+
pythonPath = with python2Packages; [ requests.dev ];
26
+
17
27
# Makefile has /usr/local/bin hard-coded for 'make install'
18
28
preConfigure = ''
19
29
substituteInPlace Makefile \
20
30
--replace '/usr/local' "$out" \
21
31
--replace '/usr/bin/clang++' 'clang++'
32
+
substituteInPlace Makefile \
33
+
--replace 'python setup.py install' "python setup.py install --prefix=$out"
22
34
'';
23
35
24
36
preInstall = ''
25
-
mkdir -p $out/bin
37
+
mkdir -p $out/bin $(toPythonPath "$out")
38
+
export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out")
26
39
'';
27
40
28
-
nativeBuildInputs = [ pkgconfig ];
29
-
buildInputs = [
30
-
glfw libGLU glfw libXrandr libXdamage
31
-
libXext libXrender libXinerama libXcursor libXxf86vm
32
-
libXi libX11
33
-
] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
41
+
postInstall = ''
42
+
wrapPythonPrograms
43
+
'';
34
44
35
45
meta = with stdenv.lib; {
36
46
description = "Live GLSL coding renderer";