From a31d98f3120e0f676303b7fc3e84424e6b325290 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 25 Feb 2018 03:23:58 +0100 Subject: tree-wide: autorename gnome packages to use dashes --- pkgs/applications/networking/browsers/midori/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/networking/browsers/midori/default.nix') diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index cea6d5dbeea4..f7d4f1a69417 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 -, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core +, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3 +, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core , zeitgeistSupport ? false, zeitgeist ? null }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr - libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core + gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr + libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core (libsoup.override {gnomeSupport = true; valaSupport = true;}) ] ++ stdenv.lib.optionals zeitgeistSupport [ zeitgeist @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lX11"; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules") ''; } -- cgit 1.4.1