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

Merge pull request #288 from vcunat/vlada/gtk-renames

Browse Source 
rename the expressions of some gtk-related libraries
This commit is contained in:
Vladimír Čunát 2013-02-02 01:19:29 -08:00
commit d6191d63ba
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/atk/2.6.x.nix → pkgs/development/libraries/atk/default.nix
View File

3
pkgs/development/libraries/gdk-pixbuf/2.26.x.nix → pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }: { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
, jasper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.26.5"; name = "gdk-pixbuf-2.26.5";

0
pkgs/development/libraries/glib/2.34.x.nix → pkgs/development/libraries/glib/default.nix
View File

0
pkgs/development/libraries/gtk+/2.24.x.nix → pkgs/development/libraries/gtk+/2.x.nix
View File

10
pkgs/development/libraries/pango/1.30.x.nix → pkgs/development/libraries/pango/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pango-1.30.1"; name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz"; url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
}; };
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng ]; propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -3934,13 +3934,13 @@ let
gtkmm; gtkmm;
}; };
glib = callPackage ../development/libraries/glib/2.34.x.nix { }; glib = callPackage ../development/libraries/glib { };
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
glib_networking = callPackage ../development/libraries/glib-networking {}; glib_networking = callPackage ../development/libraries/glib-networking {};
atk = callPackage ../development/libraries/atk/2.6.x.nix { }; atk = callPackage ../development/libraries/atk { };
atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
@ -3949,13 +3949,13 @@ let
}; };
pixman_cairo = callPackage ../development/libraries/pixman { }; pixman_cairo = callPackage ../development/libraries/pixman { };
pango = callPackage ../development/libraries/pango/1.30.x.nix { }; pango = callPackage ../development/libraries/pango { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
gtk = pkgs.gtk2; gtk = pkgs.gtk2;