NixOS · Mar 7, 2019 · Mar 7, 2019 · Mar 7, 2019
Showing with 15 additions and 7 deletions.

+1 −1 pkgs/desktops/gnome-3/core/tracker/default.nix

+1 −1 pkgs/desktops/gnome-3/core/tracker/fix-paths.patch

+11 −3 pkgs/development/libraries/pango/default.nix

+2 −2 pkgs/tools/networking/network-manager/default.nix
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      glib-dev = glib.dev;
+      glib_dev = glib.dev;
     })
   ];
 

diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
@@ -5,7 +5,7 @@
  Name=Tracker Store
  Comment=Metadata database store and lookup manager
 -Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
-+Exec=@glib-dev@/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
++Exec=@glib_dev@/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
  Terminal=false
  Type=Application
  Categories=Utility;

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
@@ -1,31 +1,39 @@
 { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
 , libintl, gobject-introspection, darwin, fribidi, gnome3
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
+, meson, ninja
 }:
 
 with stdenv.lib;
 
 let
   pname = "pango";
-  version = "1.42.4";
+  version = "1.43.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx";
+    sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [
+    meson ninja
+    pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
+  ];
   buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     Carbon
     CoreGraphics
     CoreText
   ]);
   propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
 
+  mesonFlags = [
+    "-Denable_docs=true"
+  ];
+
   enableParallelBuilding = true;
 
   # Fontconfig error: Cannot load default config file

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
@@ -9,11 +9,11 @@ let
   pname = "NetworkManager";
 in stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "1.17.0";
+  version = "1.15.90";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ai7inidh9w7wbi9yr6j5yvzkpy6i9xnsl9iz2wnmv52mqc70r7m";
+    sha256 = "0d8i67ag15v0sgrkys0jwymz59xb6pixaj4x9xhc6ihgqln9ap3p";
   };
 
   outputs = [ "out" "dev" ];