Commit graph

39 commits

Author SHA1 Message Date
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Tadas Barzdzius 32af0c1f7d spotify: remove broken 32-bit support and cleanup workarounds 2015-06-23 13:28:00 +03:00
Siarhei Zirukin de4fdcc7e7 spotify: 0.9.11.27 -> 0.9.17.1 2015-03-24 18:21:39 +01:00
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Eelco Dolstra 6c4d79191c spotify: Drop more unused dependencies 2015-01-20 15:47:34 +01:00
Eelco Dolstra 836cc2f64d spotify: Drop unused qt4webkit dependency 2015-01-20 15:47:33 +01:00
Eelco Dolstra 3ea88fec96 spotify: Install in $out/lib/spotify instead of $out/lib
This prevents nix-env collisions with other packages like Hipchat due
to private copies of libQtWebKit.so.4 and other libraries.
2015-01-20 15:47:33 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Georges Dubus 938cd64a6a spotify: Fixed sha for i686 2014-07-29 14:01:39 +02:00
Rickard Nilsson 2b8b29c3dd spotify: Update from 0.9.10.17 to 0.9.11.27 (x86_64) 2014-07-29 11:56:29 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Rickard Nilsson 11ac14f31b spotify: Update from 0.9.4.183.g644e24e.428 to 0.9.10.17.g4129e1c.78 (only for x86_64) 2014-05-30 10:18:39 +02:00
Rickard Nilsson dd592d7ef3 spotify: Fix missing src url for qt. Add missing dependencies. 2014-05-13 12:04:45 +02:00
Jason \"Don\" O'Conal 0c5f72af58 spotify: fix finding libXdamage.so.1
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-08 23:48:10 +00:00
Bjørn Forsman 4acb16af4e spotify: install .desktop file 2013-10-22 20:45:10 +02:00
Bjørn Forsman 82fdd91543 spotify: update meta.homepage 2013-10-22 20:43:54 +02:00
Bjørn Forsman fc8f8932e1 spotify: remove outdated info
Spotify for Linux works with free accounts since the end of 2011. I
verified this myself today.

Ref: http://www.omgubuntu.co.uk/2011/12/spotify-on-linux-works-for-free-accounts-offers-15-million-tracks
2013-10-22 20:43:54 +02:00
Bjørn Forsman d4e469d307 spotify: unbreak it
Spotify doesn't start:

$ ./result/bin/spotify
/nix/store/yx05s6irqil8a24ilyvjvhnjljmm8f15-spotify-0.9.4.183/bin/.spotify-wrapped: error while loading shared libraries: libcef.so: cannot open shared object file: No such file or directory

That is fixed with adding $out/spotify-client/Data to RPATH.

Then Spotify errors out trying to open libudev.so.0. We don't have that
in nixpkgs, so I'm making a symlink to libudev.so.1 instead.

Tested on NixOS x86_64-linux.
2013-10-22 20:43:54 +02:00
Jason "Don" O'Conal 6eba129774 spotify: update to latest version 2013-10-22 20:43:54 +02:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Rickard Nilsson 266da813a3 spotify: Update to 0.9.1.55 2013-06-25 12:20:11 +02:00
Moritz Ulrich 6d406bd945 Update spotify to 0.9.0.133.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-05-05 12:25:21 +02:00
Rob Vermaas 784d2b2d16 Update to latest spotify 2013-03-12 22:13:29 +01:00
Rob Vermaas b512e3e934 Initial try to update spotify to version 0.8.4.103. Still need to get rid
of LD_LIBRARY_PATH wrapper, and properly patchelf any libs in the spotify
prefix.
2013-03-12 22:13:29 +01:00
Rickard Nilsson c12005ef56 spotify 0.8.3.278.
svn path=/nixpkgs/trunk/; revision=34109
2012-05-15 14:31:43 +00:00
Eelco Dolstra 399c575139 * Updated Spotify to 0.6.6.10.
svn path=/nixpkgs/trunk/; revision=31935
2012-01-30 16:44:56 +00:00
Eelco Dolstra 572b54cb9c * Spotify updated to the latest version.
svn path=/nixpkgs/trunk/; revision=29953
2011-10-21 02:26:26 +00:00
Eelco Dolstra f607e23168 * Spotify needs OpenSSL now.
svn path=/nixpkgs/trunk/; revision=29456
2011-09-23 15:37:15 +00:00
Shea Levy 65898538b5 Bump spotify... Sure wish they kept around old versions
svn path=/nixpkgs/trunk/; revision=29454
2011-09-23 15:23:30 +00:00
Eelco Dolstra 6b302190a4 * Spotify: drop PulseAudio from the library path, as Spotify seems to
have it statically linked anyway.

svn path=/nixpkgs/trunk/; revision=27972
2011-07-27 14:01:47 +00:00
Eelco Dolstra 7eb1afad49 * Spotify: use PulseAudio if available.
svn path=/nixpkgs/trunk/; revision=27971
2011-07-26 22:24:02 +00:00
Shea Levy 5869748e70 Update Spotify
Only tested x86_64

svn path=/nixpkgs/trunk/; revision=27914
2011-07-24 01:39:11 +00:00
Eelco Dolstra 2e5d962f72 * Spotify updated to 0.5.1.151.
svn path=/nixpkgs/trunk/; revision=27831
2011-07-18 22:34:57 +00:00
Eelco Dolstra 3c0dc22e91 * x86_64-linux requires -fPIC.
svn path=/nixpkgs/trunk/; revision=25893
2011-02-11 11:26:40 +00:00
Eelco Dolstra 4ddf706a2f * New adventures in purity: get Spotify to work without a
/usr/share/spotify symlink by rewriting open() and stat() calls.

svn path=/nixpkgs/trunk/; revision=25892
2011-02-11 11:16:18 +00:00
Eelco Dolstra def604cc62 * Spotify: add the 32-bit version and provide a longDescription.
svn path=/nixpkgs/trunk/; revision=25436
2011-01-06 10:17:18 +00:00
Eelco Dolstra f81bc24790 * Spotify for Linux (preview version). It works, but not yet out of
the box because it requires /usr/share/spotify to point at its
  resources.  So to get it to work, you should do something like:

  $ nix-env -i spotify
  $ mkdir -p /usr/share
  $ ln -s /home/eelco/.nix-profile/share/spotify /usr/share/

  Also note that the Linux client doesn't work with free Spotify
  accounts (as noted on
  https://www.spotify.com/nl/download/previews/).

svn path=/nixpkgs/trunk/; revision=25431
2011-01-05 23:23:22 +00:00