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

glslviewer: 2019-04-22 -> 1.6.8, use python3

Browse Source
This commit is contained in:
Jonathan Ringer 2020-11-01 08:57:57 -08:00 committed by Jonathan Ringer
parent 2ba1c007f6
commit e98e29ed3a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/glslviewer/default.nix
View File

@ -1,28 +1,28 @@
{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook , libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook
, Cocoa , Cocoa
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "glslviewer"; pname = "glslviewer";
version = "2019-04-22"; version = "1.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "patriciogonzalezvivo"; owner = "patriciogonzalezvivo";
repo = "glslViewer"; repo = "glslViewer";
rev = "fa3e2ed4810927d189e480b704366cca22f281f3"; rev = version;
sha256 = "1888jxi84f2nnc0kpzqrn2cada1z4zqyq8ss4ppb5y3wy7d87qjn"; sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7";
}; };
nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ];
buildInputs = [ buildInputs = [
glfw libGLU glfw libXrandr libXdamage glfw libGLU glfw libXrandr libXdamage
libXext libXrender libXinerama libXcursor libXxf86vm libXext libXrender libXinerama libXcursor libXxf86vm
libXi libX11 libXi libX11
] ++ (with python2Packages; [ python setuptools wrapPython ]) ] ++ (with python3Packages; [ python setuptools wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin Cocoa; ++ 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' # Makefile has /usr/local/bin hard-coded for 'make install'
preConfigure = '' preConfigure = ''
@ -31,6 +31,7 @@ stdenv.mkDerivation {
--replace '/usr/bin/clang++' 'clang++' --replace '/usr/bin/clang++' 'clang++'
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace 'python setup.py install' "python setup.py install --prefix=$out" --replace 'python setup.py install' "python setup.py install --prefix=$out"
2to3 -w bin/*
''; '';
preInstall = '' preInstall = ''