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/glibmm/default.nix | |
parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
download | nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.zip |
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/glibmm/default.nix')
-rw-r--r-- | pkgs/development/libraries/glibmm/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 962b14bc788..6801012e855 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: +let + ver_maj = "2.38"; + ver_min = "1"; +in stdenv.mkDerivation rec { - name = "glibmm-2.34.1"; + name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz"; - sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl"; + url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; + sha256 = "18n4czi6lh4ncj54apxms18xn9k8pmrp2ba9sxn0sk9w3pp2bja9"; }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ]; + propagatedBuildInputs = [ glib libsigcxx ]; + + #doCheck = true; # some tests need network meta = { description = "C++ interface to the GLib library"; |