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: 2ba1c007f6ba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e98e29ed3a00
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 1, 2020

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

    Jonathan Ringer committed Nov 1, 2020
    Copy the full SHA
    e98e29e View commit details
Showing with 9 additions and 8 deletions.
  1. +9 −8 pkgs/development/tools/glslviewer/default.nix
17 changes: 9 additions & 8 deletions pkgs/development/tools/glslviewer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''