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

gtk3 stack libs: update all to gnome-3.14 branches

Browse Source 
All NEWS look safe and relatively quiet.
This commit is contained in:
Vladimír Čunát 2014-10-21 20:47:30 +02:00
parent 12e29daed7
commit 3ecd4dcf72
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }: , intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
versionMajor = "2.12"; versionMajor = "2.14";
versionMinor = "1"; versionMinor = "1";
moduleName = "at-spi2-atk"; moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}"; name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336"; sha256 = "1jvvs5bb63xa8ip4cvmpmyyc35gyh39bvwn967wabw7dc3m393q5";
}; };
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi

12
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
versionMajor = "2.12"; versionMajor = "2.14";
versionMinor = "0"; versionMinor = "0";
moduleName = "at-spi2-core"; moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}"; name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv"; sha256 = "1j0l4l4qx0i4s9zzwhiwvw3hfjnrbmknvwkzvqpvb5gndqpb01sq";
}; };
buildInputs = [ buildInputs = [
@ -21,12 +21,10 @@ stdenv.mkDerivation (rec {
# ToDo: on non-NixOS we create a symlink from there? # ToDo: on non-NixOS we create a symlink from there?
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl";
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }
// stdenv.lib.optionalAttrs stdenv.isDarwin {
NIX_LDFLAGS = "-lintl";
}
)

4
pkgs/development/libraries/atk/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let let
ver_maj = "2.12"; ver_maj = "2.14";
ver_min = "0"; ver_min = "0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28"; sha256 = "1bgvp0isbmf0vb282pncsachqgkrg5zk6an2cv077cdz685wqx98";
}; };
buildInputs = libintlOrEmpty; buildInputs = libintlOrEmpty;

4
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -5,7 +5,7 @@
# In that case its about 6MB which could be separated # In that case its about 6MB which could be separated
let let
ver_maj = "1.40"; ver_maj = "1.42";
ver_min = "0"; ver_min = "0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln"; sha256 = "1xwm7wmr9r9wp6xljb3bckx3a4siybavaq39w46ly7gpskxfv8iv";
}; };
buildInputs = [ flex bison glib pkgconfig python ] buildInputs = [ flex bison glib pkgconfig python ]

6
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
let let
ver_maj = "3.12"; ver_maj = "3.14";
ver_min = "2"; ver_min = "4";
version = "${ver_maj}.${ver_min}"; version = "${ver_maj}.${ver_min}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; sha256 = "0bzgggy3rljij0ck12hrv63lry1a57inc5a94g3b1ni3swbcf1m0";
}; };
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];