mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
rename the expressions of some gtk-related libraries
now the default (and usually only) version is called default
This commit is contained in:
parent
57248e25e6
commit
6331d32267
@ -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 {
|
||||
name = "gdk-pixbuf-2.26.5";
|
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pango-1.30.1";
|
||||
name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz";
|
||||
sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
|
||||
url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
|
||||
sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
|
||||
propagatedBuildInputs = [ x11 glib cairo libpng ];
|
||||
propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -3934,25 +3934,25 @@ let
|
||||
gtkmm;
|
||||
};
|
||||
|
||||
glib = callPackage ../development/libraries/glib/2.34.x.nix { };
|
||||
glib = callPackage ../development/libraries/glib { };
|
||||
|
||||
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
|
||||
|
||||
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 { };
|
||||
|
||||
cairo = callPackage ../development/libraries/cairo { };
|
||||
|
||||
pango = callPackage ../development/libraries/pango/1.30.x.nix { };
|
||||
pango = callPackage ../development/libraries/pango { };
|
||||
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user