From 8250fcb326d7936f302229c2d03e95dfb3afdaed Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 27 Aug 2019 14:25:43 -0400 Subject: [PATCH] fixup! treewide: use glib.{getSchemaPath, makeSchemaPath} --- pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index e1735476c1e..cff0db665bb 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-paths.patch; gapplication = "${glib.bin}/bin/gapplication"; - mutter_gsettings_path = "${glib.getSchemaPath gnome3.mutter}"; + mutter_gsettings_path = glib.getSchemaPath gnome3.mutter; }) ]; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 1738c24017c..46ca01c1a1a 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/settings/gpaste-settings.c \ - --subst-var-by gschemasCompiled ${glib.makeSchemaPath "$out" "${pname}-${version}"} + --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} ''; nativeBuildInputs = [