From d57d4148f66ea6e4a0d1577b522791ccff0f2678 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 14:31:34 -0600 Subject: [PATCH] vimb: simplify with wrapGAppsHook wrapGAppsHook per reviewer suggestion, ty! :) --- .../networking/browsers/vimb/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 4293b3392f6..569a4593dfe 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libsoup, webkit, gtk3, glib-networking -, gsettings-desktop-schemas, makeWrapper +, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,16 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ gtk3 libsoup webkit gsettings-desktop-schemas ]; + nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + buildInputs = [ gtk3 libsoup webkit glib-networking gsettings-desktop-schemas ]; - makeFlags = [ "PREFIX=$(out)" ]; - - preFixup = '' - wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { description = "A Vim-like browser";