diff options
author | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
commit | 0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (patch) | |
tree | bd701e982d896952f4291e4b795c85bb581593b8 /nixpkgs/pkgs/desktops/xfce4-14 | |
parent | dae1ae41b3a575e87d411e0cd9daa42a85c5aa89 (diff) | |
parent | 1c40ee6fc44f7eb474c69ea070a43247a1a2c83c (diff) |
Merge commit '1c40ee6fc44f7eb474c69ea070a43247a1a2c83c'
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce4-14')
-rw-r--r-- | nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix index ecbc62d8ffb..e99551bd8d2 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/tumbler/default.nix @@ -27,4 +27,9 @@ mkXfceDerivation { libgsf poppler # technically the glib binding ]; + + # WrapGAppsHook won't touch this binary automatically, so we wrap manually. + postFixup = '' + wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}" + ''; } diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix index 27fae12981c..dd3a9af1680 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfburn/default.nix @@ -9,4 +9,5 @@ mkXfceDerivation { nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ]; + meta.broken = true; } diff --git a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix index 78e98e9ea7d..3b9cd268d55 100644 --- a/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }: +{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2 }: mkXfceDerivation { category = "apps"; @@ -7,7 +7,7 @@ mkXfceDerivation { sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; - buildInputs = [ gtk3 libxfce4ui vte xfconf ]; + buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; meta = { description = "A modern terminal emulator"; |