diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
| commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
| tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/tools/misc/yad/default.nix | |
| parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
| parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
| download | nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip | |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/tools/misc/yad/default.nix')
| -rw-r--r-- | pkgs/tools/misc/yad/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d884d48f5214..2c8660a49139 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -13,10 +13,18 @@ stdenv.mkDerivation rec { "--enable-icon-browser" ]; + # for gcc5: c11 inline semantics breaks the build + NIX_CFLAGS_COMPILE = "-fgnu89-inline"; + buildInputs = [ gtk2 ]; nativeBuildInputs = [ pkgconfig intltool ]; + postPatch = '' + sed -i src/file.c -e '21i#include <glib/gprintf.h>' + sed -i src/form.c -e '21i#include <stdlib.h>' + ''; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { |