diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-03-21 13:45:12 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-03-21 13:45:12 +0400 |
commit | 8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd (patch) | |
tree | 3af49da70b49077120c72ef8d27a70c7a5435312 | |
parent | afe7609e25f6953d52c1826146f120d348701d92 (diff) | |
download | nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.tar nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.tar.gz nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.tar.bz2 nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.tar.lz nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.tar.xz nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.tar.zst nixlib-8e5dc9b5df8a179f6934a37ac34fcf30529ab0bd.zip |
Fix K3D gtlglext handling
-rw-r--r-- | pkgs/applications/graphics/k3d/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 058d0f79a2f4..8920d243dbf0 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' 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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57ffb694eb6f..7cb96b8a6786 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7320,7 +7320,7 @@ let jwm = callPackage ../applications/window-managers/jwm { }; k3d = callPackage ../applications/graphics/k3d { - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; keepnote = callPackage ../applications/office/keepnote { |