From 56d73eae01c9fe55eb2b32f83ce416e56b328ea3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 23 Oct 2014 04:31:14 +0400 Subject: smpeg: fix smpeg-config --- pkgs/development/libraries/smpeg/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 30c1f4937ec..c2473ae2c5d 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ]; + buildInputs = [ SDL gtk mesa ]; + + nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; preConfigure = '' touch NEWS AUTHORS ChangeLog @@ -26,6 +28,10 @@ stdenv.mkDerivation rec { -e 's,"SDL_thread.h",,' \ -e 's,"SDL_types.h",,' \ $out/include/smpeg/*.h + + wrapProgram $out/bin/smpeg-config \ + --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig" ''; meta = { -- cgit 1.4.1