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

Split some more packages

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-24 23:14:45 -04:00
parent 7369c443a8
commit 21b7946878
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/build-support/multiple-outputs.nix
View File

@ -13,15 +13,19 @@ stdenv.mkDerivation (args // {
[ "--libdir=$(lib)/lib" ] [ "--libdir=$(lib)/lib" ]
++ optional (elem "dev" outputs) ++ optional (elem "dev" outputs)
"--includedir=$(dev)/include" "--includedir=$(dev)/include"
++ args.configureFlags or []; ++ [ (toString args.configureFlags or []) ];
installFlags = installFlags =
optionals (elem "dev" outputs) optionals (elem "dev" outputs)
[ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" "aclocaldir=$(dev)/share/aclocal" ] [ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" "aclocaldir=$(dev)/share/aclocal" ]
++ args.installFlags or []; ++ [ (toString args.installFlags or []) ];
postInstall = #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or [];
preFixup =
'' ''
runHook preFixupOutputs
if [ -n "$doc" -a -e $out/share/doc ]; then if [ -n "$doc" -a -e $out/share/doc ]; then
mkdir -p $doc/share/doc mkdir -p $doc/share/doc
mv $out/share/doc/* $doc/share/doc mv $out/share/doc/* $doc/share/doc
@ -42,10 +46,12 @@ stdenv.mkDerivation (args // {
fi fi
for i in $bin $lib; do for i in $bin $lib; do
prefix="$i" stripDirs "lib lib64 libexec bin sbin" "${stripDebugFlags:--S}" prefix="$i" stripDirs "lib lib64 libexec bin sbin" "''${stripDebugFlags:--S}"
prefix="$i" patchELF prefix="$i" patchELF
patchShebangs "$i" patchShebangs "$i"
done done
runHook postFixupOutputs
''; # */ ''; # */
}) })

2
pkgs/development/libraries/acl/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "09aj30m49ivycl3irram8c3givc0crivjm3ymw0nhfaxrwhlb186"; sha256 = "09aj30m49ivycl3irram8c3givc0crivjm3ymw0nhfaxrwhlb186";
}; };
outputs = [ "dev" "out" "bin" "doc" ];
buildNativeInputs = [ gettext ]; buildNativeInputs = [ gettext ];
buildInputs = [ attr ]; buildInputs = [ attr ];

2
pkgs/development/libraries/attr/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw"; sha256 = "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw";
}; };
outputs = [ "dev" "out" "bin" "doc" ];
buildNativeInputs = [ gettext ]; buildNativeInputs = [ gettext ];
configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";

11
pkgs/development/libraries/speex/default.nix
View File

@ -2,11 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "speex-1.2rc1"; name = "speex-1.2rc1";
src = fetchurl { src = fetchurl {
url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl"; sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
}; };
buildInputs = [ libogg ]; buildInputs = [ libogg ];
outputs = [ "dev" "out" "bin" "doc" ];
meta = {
homepage = http://www.speex.org/;
description = "A audio compression codec designed for speech";
};
} }

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

@ -3234,7 +3234,9 @@ let
aalib = callPackage ../development/libraries/aalib { }; aalib = callPackage ../development/libraries/aalib { };
acl = callPackage ../development/libraries/acl { }; acl = callPackage ../development/libraries/acl {
stdenv = stdenvMulti;
};
adns = callPackage ../development/libraries/adns { }; adns = callPackage ../development/libraries/adns { };
@ -3271,7 +3273,9 @@ let
attica = callPackage ../development/libraries/attica { }; attica = callPackage ../development/libraries/attica { };
attr = callPackage ../development/libraries/attr { }; attr = callPackage ../development/libraries/attr {
stdenv = stdenvMulti;
};
aqbanking = callPackage ../development/libraries/aqbanking { }; aqbanking = callPackage ../development/libraries/aqbanking { };
@ -4783,7 +4787,9 @@ let
speech_tools = callPackage ../development/libraries/speech-tools {}; speech_tools = callPackage ../development/libraries/speech-tools {};
speex = callPackage ../development/libraries/speex { }; speex = callPackage ../development/libraries/speex {
stdenv = stdenvMulti;
};
sphinxbase = callPackage ../development/libraries/sphinxbase { }; sphinxbase = callPackage ../development/libraries/sphinxbase { };