diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/glib | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index d41bfd2f413b..30f43c00a05d 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.70.1"; + version = "2.70.2"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+be85/UXU6H0OFO7ysqL8J4V6ZQmjinP16dvZWNiY8A="; + sha256 = "BVFFnIXNPaPVjdyQFv0ovlr1A/XhYVpxultRKslFgG8="; }; patches = optionals stdenv.isDarwin [ @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre + ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ libselinux @@ -143,6 +144,9 @@ stdenv.mkDerivation rec { patchShebangs glib/gen-unicode-tables.pl patchShebangs tests/gen-casefold-txt.py patchShebangs tests/gen-casemap-txt.py + '' + lib.optionalString stdenv.hostPlatform.isWindows '' + substituteInPlace gio/win32/meson.build \ + --replace "libintl, " "" ''; DETERMINISTIC_BUILD = 1; @@ -191,10 +195,17 @@ stdenv.mkDerivation rec { passthru = rec { gioModuleDir = "lib/gio/modules"; - makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; + + makeSchemaDataDirPath = dir: name: "${dir}/share/gsettings-schemas/${name}"; + makeSchemaPath = dir: name: "${makeSchemaDataDirPath dir name}/glib-2.0/schemas"; getSchemaPath = pkg: makeSchemaPath pkg pkg.name; + getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; + inherit flattenInclude; - updateScript = gnome.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { + packageName = "glib"; + versionPolicy = "odd-unstable"; + }; }; meta = with lib; { |