Skip to content

Commit

Permalink
guile rev-deps: fix build by adding pkgconfig
Browse files Browse the repository at this point in the history
Without it packages fail to find the headers, after guile has split
them into a separate output in 218713a.
  • Loading branch information
vcunat committed Feb 18, 2017
1 parent 24b1c6e commit 714eabc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion pkgs/development/guile-modules/guile-ncurses/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, ncurses, libffi }:
{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }:

stdenv.mkDerivation rec {
name = "guile-ncurses-1.7";
Expand All @@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile ncurses libffi ];

preConfigure =
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/guile-modules/guile-sdl/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, guile, buildEnv
{ stdenv, fetchurl, pkgconfig, guile, buildEnv
, SDL, SDL_image, SDL_ttf, SDL_mixer
}:

Expand All @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am";
};

nativeBuildInputs = [ guile ];
nativeBuildInputs = [ pkgconfig guile ];

buildInputs = [
SDL.dev SDL_image SDL_ttf SDL_mixer
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libmatheval/default.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion pkgs/tools/X11/xbindkeys/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, guile }:
{ stdenv, fetchurl, pkgconfig, libX11, guile }:

let version = "1.8.6"; in
stdenv.mkDerivation {
Expand All @@ -8,6 +8,7 @@ stdenv.mkDerivation {
sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 guile ];

meta = {
Expand Down

0 comments on commit 714eabc

Please sign in to comment.