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

Fixed Snd build

Browse Source 
svn path=/nixpkgs/trunk/; revision=12124
This commit is contained in:
Michael Raskin 2008-06-16 16:33:11 +00:00
parent 65b252a0df
commit 68e45690c3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/audio/snd/default.nix
View File

@ -6,7 +6,7 @@ args : with args;
sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm"; 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 ? ruby) args.ruby)
++ (lib.optional (args ? mesa) args.mesa) ++ (lib.optional (args ? mesa) args.mesa)
++ (lib.optional (args ? guile) args.guile) ++ (lib.optional (args ? guile) args.guile)
@ -23,6 +23,7 @@ args : with args;
in with localDefs; in with localDefs;
let preBuild = FullDepEntry (" let preBuild = FullDepEntry ("
cp config.log /tmp/snd-config.log cp config.log /tmp/snd-config.log
export NIX_LDFLAGS=\"$NIX_LDFLAGS -L${libX11}/lib -lX11 \"
") [minInit doUnpack]; ") [minInit doUnpack];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/top-level/all-packages.nix
View File

@ -6272,7 +6272,7 @@ let pkgs = rec {
sndFun = lib.sumArgs (import ../applications/audio/snd) { sndFun = lib.sumArgs (import ../applications/audio/snd) {
inherit fetchurl stdenv builderDefs stringsWithDeps lib; inherit fetchurl stdenv builderDefs stringsWithDeps lib;
inherit pkgconfig gmp gettext; inherit pkgconfig gmp gettext;
inherit (xlibs) libXpm; inherit (xlibs) libXpm libX11;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
}; };