From 714eabc5af342f81fc36481486b4b388ebefb8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Feb 2017 08:23:07 +0100 Subject: [PATCH] guile rev-deps: fix build by adding pkgconfig Without it packages fail to find the headers, after guile has split them into a separate output in 218713a. --- pkgs/development/guile-modules/guile-ncurses/default.nix | 3 ++- pkgs/development/guile-modules/guile-sdl/default.nix | 4 ++-- pkgs/development/libraries/libmatheval/default.nix | 4 ++-- pkgs/tools/X11/xbindkeys/default.nix | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 291b410ef93..bd6d9075130 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, ncurses, libffi }: +{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }: stdenv.mkDerivation rec { name = "guile-ncurses-1.7"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile ncurses libffi ]; preConfigure = diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 94f3418b031..e2bfe485c5b 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, guile, buildEnv +{ stdenv, fetchurl, pkgconfig, guile, buildEnv , SDL, SDL_image, SDL_ttf, SDL_mixer }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am"; }; - nativeBuildInputs = [ guile ]; + nativeBuildInputs = [ pkgconfig guile ]; buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 7336e7d757a..467d707adee 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, guile, autoconf, flex, fetchpatch }: +{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }: stdenv.mkDerivation rec { version = "1.1.11"; name = "libmatheval-${version}"; - nativeBuildInputs = [ autoconf flex ]; + nativeBuildInputs = [ pkgconfig autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 0d63c190b05..1c23593bd14 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, guile }: +{ stdenv, fetchurl, pkgconfig, libX11, guile }: let version = "1.8.6"; in stdenv.mkDerivation { @@ -8,6 +8,7 @@ stdenv.mkDerivation { sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 guile ]; meta = {