diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/libraries/glib | |
parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 97ad7da16260d..812148c7adc6e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -10,6 +10,13 @@ # Possible solution: disable compilation of this example somehow # Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i # $out/bin/gtester-report' to postInstall if this is solved +/* + * Use --enable-installed-tests for GNOME-related packages, + and use them as a separately installed tests runned by Hydra + (they should test an already installed package) + https://wiki.gnome.org/GnomeGoals/InstalledTests + * Support org.freedesktop.Application, including D-Bus activation from desktop files +*/ let # Some packages don't get "Cflags" from pkgconfig correctly @@ -24,15 +31,18 @@ let done ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; + + ver_maj = "2.38"; + ver_min = "2"; in with { inherit (stdenv.lib) optionalString; }; stdenv.mkDerivation rec { - name = "glib-2.36.4"; + name = "glib-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz"; - sha256 = "0zmdbkg2yjyxdl72w34lxvrssbzqzdficskkfn22s0994dad4m7n"; + url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; + sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5"; }; # configure script looks for d-bus but it is (probably) only needed for tests |