diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ea7dba743d..10b7866fe4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1562,6 +1562,10 @@ rec { inherit fetchurl stdenv; }; + ffmpeg_svn = import ../development/libraries/ffmpeg_svn_snapshot { + inherit fetchurl stdenv; + }; + # commented out because it's using the new configuration style proposal which is unstable # needs some testing .. @@ -1808,6 +1812,11 @@ rec { inherit fetchurl stdenv pkgconfig libusb; }; + # commented out because it's using the new configuration style proposal which is unstable + #libsamplerate = (import ../development/libraries/libsamplerate) { + # inherit fetchurl stdenv mkDerivationByConfigruation pkgconfig lib; + #}; + libgsf = import ../development/libraries/libgsf { inherit fetchurl stdenv perl perlXMLParser pkgconfig libxml2 gettext; inherit (gnome) glib; @@ -2231,6 +2240,11 @@ rec { ### DEVELOPMENT / LIBRARIES / HASKELL + # usage: see ghcPkgUtil.sh - use setup-new2 because of PATH_DELIMITER + ghcPkgUtil = runCommand "ghcPkgUtil-internal" + { ghcPkgUtil = ../development/libraries/haskell/generic/ghcPkgUtil.sh; } + "mkdir -p $out/nix-support; cp $ghcPkgUtil \$out/nix-support/setup-hook;"; + uulib64 = import ../development/libraries/haskell/uulib { # !!! remove? inherit stdenv fetchurl ghc; @@ -3806,6 +3820,21 @@ rec { inherit (xlibs) libXmu; }; + # commented out because it's using the new configuration style proposal which is unstable + /* + sox = import ../applications/misc/audio/sox { + inherit fetchurl stdenv lib mkDerivationByConfigruation; + # optional features + inherit alsaLib /*libao*/; + inherit libsndfile libogg flac libmad lame libsamplerate; + # Using the default nix ffmpeg I get this error when linking + # .libs/libsox_la-ffmpeg.o: In function `audio_decode_frame': + # /tmp/nix-7957-1/sox-14.0.0/src/ffmpeg.c:130: undefined reference to `avcodec_decode_audio2 + # That's why I'v added ffmpeg_svn + ffmpeg = ffmpeg_svn; + }; + */ + spoofax = import ../applications/editors/eclipse/plugins/spoofax { inherit fetchurl stdenv; }; |