diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-10-21 07:02:04 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-10-21 07:02:04 +0000 |
| commit | bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d (patch) | |
| tree | 908e56fb4e62e18d6b9f0bdff1d4729618400dfa /pkgs/desktops | |
| parent | cfb6be6e31c5aea6d0ecb24afb1f0c1702488ea3 (diff) | |
| download | nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.tar nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.tar.gz nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.tar.bz2 nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.tar.lz nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.tar.xz nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.tar.zst nixlib-bed14405fbbe1790fd1b90b96a0f75b6a99d8c2d.zip | |
Fix gtkglext build
svn path=/nixpkgs/trunk/; revision=17906
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2.28/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 9cddb9d913d7..83bda71dc4bc 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -262,6 +262,6 @@ rec { gtkglext = import ./platform/gtkglext { inherit (pkgs) stdenv fetchurl mesa pkgconfig; - inherit (pkgs.gtkLibs) gtk; + inherit (pkgs.gtkLibs) gtk pango; }; } diff --git a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix index 228cb8222848..2f9e268afbe2 100644 --- a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, mesa}: +{stdenv, fetchurl, pkgconfig, gtk, mesa, pango}: stdenv.mkDerivation { name = "gtkglext-1.0.6"; @@ -6,5 +6,6 @@ stdenv.mkDerivation { url = mirror://gnome/sources/gtkglext/1.0/gtkglext-1.0.6.tar.bz2; sha256 = "1a9kpw1jx6d0dyljgv6f8kj2xdmyvrkyfds879wxk8x6n60gpcdj"; }; - buildInputs = [ pkgconfig gtk mesa ]; + NIX_LDFLAGS="-lpango-1.0 -lpangox-1.0"; + buildInputs = [ pkgconfig gtk mesa pango ]; } |