From 68e45690c30603b15b362e55e144bb7c57737381 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 16 Jun 2008 16:33:11 +0000
Subject: [PATCH] Fixed Snd build
svn path=/nixpkgs/trunk/; revision=12124
---
pkgs/applications/audio/snd/default.nix | 3 ++-
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 3b5bff294c34..e500ff736d4c 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -6,7 +6,7 @@ args : with args;
sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
};
- buildInputs = [gtk glib pkgconfig libXpm gmp gettext]
+ buildInputs = [gtk glib pkgconfig libXpm gmp gettext libX11]
++ (lib.optional (args ? ruby) args.ruby)
++ (lib.optional (args ? mesa) args.mesa)
++ (lib.optional (args ? guile) args.guile)
@@ -23,6 +23,7 @@ args : with args;
in with localDefs;
let preBuild = FullDepEntry ("
cp config.log /tmp/snd-config.log
+ export NIX_LDFLAGS=\"$NIX_LDFLAGS -L${libX11}/lib -lX11 \"
") [minInit doUnpack];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04ec6b9d1dad..c792da2889aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6272,7 +6272,7 @@ let pkgs = rec {
sndFun = lib.sumArgs (import ../applications/audio/snd) {
inherit fetchurl stdenv builderDefs stringsWithDeps lib;
inherit pkgconfig gmp gettext;
- inherit (xlibs) libXpm;
+ inherit (xlibs) libXpm libX11;
inherit (gtkLibs) gtk glib;
};