cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mkXfceDerivation: add wrapGAppsHook

Browse source
This commit is contained in:
worldofpeace 2019-08-16 22:56:44 -04:00
parent 49526093f9
commit feef0bbc97
5 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/xfce4-14/mkXfceDerivation.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }: { stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }:
{ category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args: { category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args:
@ -15,7 +15,7 @@ let
template = rec { template = rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
nativeBuildInputs = [ pkgconfig xfce4-dev-tools ]; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ];
buildInputs = [ hicolor-icon-theme ]; buildInputs = [ hicolor-icon-theme ];
configureFlags = [ "--enable-maintainer-mode" ]; configureFlags = [ "--enable-maintainer-mode" ];

4
pkgs/desktops/xfce4-14/parole/default.nix
View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus-glib { mkXfceDerivation, dbus, dbus-glib
, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good , gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good
, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util , gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util
, taglib ? null, xfconf }: , taglib ? null, xfconf }:
@ -17,8 +17,6 @@ mkXfceDerivation rec {
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
''; '';
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildInputs = [ buildInputs = [
dbus dbus
dbus-glib dbus-glib

3
pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, wrapGAppsHook, glib-networking }: { mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "apps"; category = "apps";
@ -7,6 +7,5 @@ mkXfceDerivation rec {
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
} }

3
pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte, xfconf }: { mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "apps"; category = "apps";
@ -8,7 +8,6 @@ mkXfceDerivation rec {
sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp";
buildInputs = [ gtk3 libxfce4ui vte xfconf ]; buildInputs = [ gtk3 libxfce4ui vte xfconf ];
nativeBuildInputs = [ wrapGAppsHook ];
meta = { meta = {
description = "A modern terminal emulator"; description = "A modern terminal emulator";

4
pkgs/desktops/xfce4-14/xfdesktop/default.nix
View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: { mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "xfce"; category = "xfce";
@ -7,8 +7,6 @@ mkXfceDerivation rec {
sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g"; sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g";
nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
buildInputs = [ buildInputs = [
exo exo
gtk3 gtk3