diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-16 23:06:19 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-17 18:55:23 -0400 |
| commit | 48240a3b51e2268ed6864a0e81d1e4c25e534f49 (patch) | |
| tree | 4c8d2109952baec046e58a77bb3aabe12122d4b8 /pkgs/desktops | |
| parent | ec4a0f81716b84ca99bac47905a418576159838d (diff) | |
| download | nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.tar nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.tar.gz nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.tar.bz2 nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.tar.lz nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.tar.xz nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.tar.zst nixpkgs-48240a3b51e2268ed6864a0e81d1e4c25e534f49.zip | |
xfce4-14.exo: workaround undeclared gio-unix-2.0
See https://github.com/NixOS/nixpkgs/issues/36468 Upstream issue: https://bugzilla.xfce.org/show_bug.cgi?id=15825
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce4-14/exo/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix index 58ea5949b55..b0dcec78765 100644 --- a/pkgs/desktops/xfce4-14/exo/default.nix +++ b/pkgs/desktops/xfce4-14/exo/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { @@ -9,13 +9,10 @@ mkXfceDerivation rec { sha256 = "013am7q4pwfncf4hk2a3hv7yx2vxgzb5xm8qsi9mxkj29xdhrvs5"; nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ]; - buildInputs = [ gtk3 libxfce4ui libxfce4util ]; + buildInputs = [ gtk3 glib libxfce4ui libxfce4util ]; - postPatch = '' - substituteInPlace exo-helper/Makefile.am \ - --replace 'exo_helper_2_CFLAGS =' \ - 'exo_helper_2_CFLAGS = $(GIO_UNIX_CFLAGS)' - ''; + # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = { description = "Application library for Xfce"; |