glslviewer: 1.2 -> 2018-01-31, fixes build

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