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

Fix K3D gtlglext handling

Browse Source
This commit is contained in:
Michael Raskin 2013-03-21 13:45:12 +04:00
parent afe7609e25
commit 8e5dc9b5df
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/graphics/k3d/default.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
''; '';
buildInputs = [ buildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -7320,7 +7320,7 @@ let
jwm = callPackage ../applications/window-managers/jwm { }; jwm = callPackage ../applications/window-managers/jwm { };
k3d = callPackage ../applications/graphics/k3d { k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome) gtkglext; inherit (pkgs.gnome2) gtkglext;
}; };
keepnote = callPackage ../applications/office/keepnote { keepnote = callPackage ../applications/office/keepnote {