diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-11-01 08:57:57 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-11-01 10:46:35 -0800 |
| commit | e98e29ed3a00f1e4e9bba4f6b2be184a262949bd (patch) | |
| tree | 76c2ab397b73f08bdbc6671c40571357c6ecde30 /pkgs/development/tools/glslviewer | |
| parent | 2ba1c007f6ba074400fd9938db5fc7e4340e14ad (diff) | |
glslviewer: 2019-04-22 -> 1.6.8, use python3
Diffstat (limited to 'pkgs/development/tools/glslviewer')
| -rw-r--r-- | pkgs/development/tools/glslviewer/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index b9e46ca41e176..84b3d2a6b1ee0 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook +, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "glslviewer"; - version = "2019-04-22"; + version = "1.6.8"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; - rev = "fa3e2ed4810927d189e480b704366cca22f281f3"; - sha256 = "1888jxi84f2nnc0kpzqrn2cada1z4zqyq8ss4ppb5y3wy7d87qjn"; + rev = version; + sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 - ] ++ (with python2Packages; [ python setuptools wrapPython ]) + ] ++ (with python3Packages; [ python setuptools wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python2Packages; [ requests ]; + pythonPath = with python3Packages; [ pyyaml requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation { --replace '/usr/bin/clang++' 'clang++' substituteInPlace Makefile \ --replace 'python setup.py install' "python setup.py install --prefix=$out" + 2to3 -w bin/* ''; preInstall = '' |