lol

glslviewer: fix darwin build

+17 -10
+14 -9
pkgs/development/tools/glslviewer/default.nix
··· 1 - { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage, 2 - libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi, 3 - libX11, mesa_glu }: 1 + { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage 2 + , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi 3 + , libX11, mesa_glu, Cocoa 4 + }: 4 5 5 6 stdenv.mkDerivation rec { 6 7 name = "glslviewer-${version}"; ··· 15 16 16 17 # Makefile has /usr/local/bin hard-coded for 'make install' 17 18 preConfigure = '' 18 - sed s,/usr/local,$out, -i Makefile 19 + substituteInPlace Makefile \ 20 + --replace '/usr/local' "$out" \ 21 + --replace '/usr/bin/clang++' 'clang++' 19 22 ''; 20 23 21 24 preInstall = '' 22 25 mkdir -p $out/bin 23 26 ''; 24 - 25 - buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage 26 - libXext libXrender libXinerama libXcursor libXxf86vm 27 - libXi libX11 ]; 28 - 27 + 28 + buildInputs = [ 29 + glfw mesa_glu pkgconfig glfw libXrandr libXdamage 30 + libXext libXrender libXinerama libXcursor libXxf86vm 31 + libXi libX11 32 + ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; 33 + 29 34 meta = with stdenv.lib; { 30 35 description = "Live GLSL coding renderer"; 31 36 homepage = http://patriciogonzalezvivo.com/2015/glslViewer/;
+3 -1
pkgs/top-level/all-packages.nix
··· 1075 1075 1076 1076 glock = callPackage ../development/tools/glock { }; 1077 1077 1078 - glslviewer = callPackage ../development/tools/glslviewer { }; 1078 + glslviewer = callPackage ../development/tools/glslviewer { 1079 + inherit (darwin.apple_sdk.frameworks) Cocoa; 1080 + }; 1079 1081 1080 1082 gmic = callPackage ../tools/graphics/gmic { }; 1081 1083