public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guile rev-deps: fix build by adding pkgconfig

Browse Source 
Without it packages fail to find the headers, after guile has split
them into a separate output in 218713a.
This commit is contained in:
Vladimír Čunát 2017-02-18 08:23:07 +01:00
parent 24b1c6ee88
commit 714eabc5af
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/guile-modules/guile-ncurses/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, ncurses, libffi }: { fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-ncurses-1.7"; name = "guile-ncurses-1.7";
@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
}; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile ncurses libffi ]; buildInputs = [ guile ncurses libffi ];
preConfigure = preConfigure =

4
pkgs/development/guile-modules/guile-sdl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, guile, buildEnv { stdenv, fetchurl, pkgconfig, guile, buildEnv
, SDL, SDL_image, SDL_ttf, SDL_mixer , SDL, SDL_image, SDL_ttf, SDL_mixer
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am"; sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am";
}; };
nativeBuildInputs = [ guile ]; nativeBuildInputs = [ pkgconfig guile ];
buildInputs = [ buildInputs = [
SDL.dev SDL_image SDL_ttf SDL_mixer SDL.dev SDL_image SDL_ttf SDL_mixer

4
pkgs/development/libraries/libmatheval/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, guile, autoconf, flex, fetchpatch }: { stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.11"; version = "1.1.11";
name = "libmatheval-${version}"; name = "libmatheval-${version}";
nativeBuildInputs = [ autoconf flex ]; nativeBuildInputs = [ pkgconfig autoconf flex ];
buildInputs = [ guile ]; buildInputs = [ guile ];
src = fetchurl { src = fetchurl {

3
pkgs/tools/X11/xbindkeys/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, guile }: { stdenv, fetchurl, pkgconfig, libX11, guile }:
let version = "1.8.6"; in let version = "1.8.6"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -8,6 +8,7 @@ stdenv.mkDerivation {
sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
}; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 guile ]; buildInputs = [ libX11 guile ];
meta = { meta = {