Commit graph

16 commits

Author SHA1 Message Date
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Arie Middelkoop cc145f2ae9 Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default).
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up.
This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the
pulse audio libs.

svn path=/nixpkgs/trunk/; revision=31959
2012-02-01 22:09:35 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Arie Middelkoop edc1c525ba Removed some debugging info that I forgot to remove *oops*.
svn path=/nixpkgs/trunk/; revision=31525
2012-01-13 22:31:42 +00:00
Arie Middelkoop 0368987722 Desktopitem for the Skype package.
svn path=/nixpkgs/trunk/; revision=31522
2012-01-13 22:21:48 +00:00
Eelco Dolstra 23e9cfac65 * Build Skype with PulseAudio support. This is needed on 64-bit
NixOS because it doesn't provide a 32-bit ALSA/Pulse module.

svn path=/nixpkgs/trunk/; revision=28123
2011-08-02 15:55:55 +00:00
Lluís Batlle i Rossell 22135b319b Updating skype. It runs fine (start, see the friends list) for me.
svn path=/nixpkgs/trunk/; revision=27973
2011-07-27 16:07:20 +00:00
Eelco Dolstra 21587bf10b * Use callPackage_i686 for i686-only packages.
svn path=/nixpkgs/trunk/; revision=23113
2010-08-11 13:25:30 +00:00
Lluís Batlle i Rossell 683688f476 Updating skype. Finally!
I think that patchelf was breaking the binary, and I decided to use a wrapper
with a LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=19968
2010-02-12 23:19:37 +00:00
Marc Weber efca5daeb7 tell skype where to find its resources - by Russell O'Connor
svn path=/nixpkgs/trunk/; revision=17924
2009-10-22 15:41:34 +00:00
Marc Weber 2db48fc660 skype url changed
patch provided by Russell O'Connor

svn path=/nixpkgs/trunk/; revision=17796
2009-10-14 03:13:44 +00:00
Peter Simons 6fb297513a Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Tobias Hammerschmidt 8c5c656fb5 fixed skype, wesnoth updated to version 1.4
svn path=/nixpkgs/trunk/; revision=11033
2008-03-10 13:09:47 +00:00
Yury G. Kudryashov 5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Marc Weber 8945b535d3 I didn't commit the first line..
svn path=/nixpkgs/trunk/; revision=9313
2007-09-12 07:35:11 +00:00
Marc Weber d27d22d32f skype (speech p2p program for non commercial use only) added
svn path=/nixpkgs/trunk/; revision=9312
2007-09-12 07:26:37 +00:00