diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-13 04:13:15 +0200 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-13 04:26:41 +0200 |
| commit | acad17f5e5492ff828d54d2ad13745a9d4f6e1c1 (patch) | |
| tree | 0017934c49c2888006ef54e4eaf8dd7f10c318ad /pkgs/development/libraries/liblastfm | |
| parent | 0ba6f6bf5bda63b327bf647584fe2f5ef9b36e51 (diff) | |
| download | nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.tar nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.tar.gz nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.tar.bz2 nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.tar.lz nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.tar.xz nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.tar.zst nixpkgs-acad17f5e5492ff828d54d2ad13745a9d4f6e1c1.zip | |
liblastfm: update to 1.0.7
Diffstat (limited to 'pkgs/development/libraries/liblastfm')
| -rw-r--r-- | pkgs/development/libraries/liblastfm/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/liblastfm/ruby-1.9.patch | 45 |
2 files changed, 8 insertions, 57 deletions
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index b1e8342ca91..6a253d06b3b 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,30 +1,26 @@ -{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }: +{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: -let version = "0.3.3"; in +let version = "1.0.7"; in stdenv.mkDerivation rec { name = "liblastfm-${version}"; # Upstream does not package git tags as tarballs. Get tarball from github. src = fetchurl { - url = "https://github.com/mxcl/liblastfm/tarball/${version}"; + url = "https://github.com/lastfm/liblastfm/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6"; + sha256 = "1837gd2azy8r34rcmsn2m1zngk4v2hpk7q0ii60dhjjvjaaswkwq"; }; prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; - nativeBuildInputs = [ ruby pkgconfig which ]; - - configureFlags = "--release"; - - patches = [ ./ruby-1.9.patch ]; - postPatch = "patchShebangs ."; + nativeBuildInputs = [ pkgconfig which cmake ]; meta = { - homepage = http://github.com/mxcl/liblastfm; + homepage = http://github.com/lastfm/liblastfm; + repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; }; } diff --git a/pkgs/development/libraries/liblastfm/ruby-1.9.patch b/pkgs/development/libraries/liblastfm/ruby-1.9.patch deleted file mode 100644 index ac6d175e73a..00000000000 --- a/pkgs/development/libraries/liblastfm/ruby-1.9.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Yury G. Kudryashov <urkud.urkud@gmail.com> -Subject: [PATCH] Fix compilation with ruby-1.9 - -__FILE__ is a relative path in ruby-1.9 - ---- - admin/Makefile.rb | 4 ++-- - admin/qpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/admin/Makefile.rb b/admin/Makefile.rb -index 592f5a5..33fe688 100755 ---- a/admin/Makefile.rb -+++ b/admin/Makefile.rb -@@ -6,7 +6,7 @@ - - cwd = File.dirname( __FILE__ ) - require 'find' --require "#{cwd}/platform.rb" -+require_relative 'platform' - - - ######################################################################### defs -@@ -158,4 +158,4 @@ puts <<-EOS - .PHONY: dist - dist: - git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2 --EOS -\ No newline at end of file -+EOS -diff --git a/admin/qpp b/admin/qpp -index 36b2d05..ee840fd 100755 ---- a/admin/qpp -+++ b/admin/qpp -@@ -4,7 +4,7 @@ - - cwd=File.dirname __FILE__ - require 'find' --require "#{cwd}/findsrc" -+require_relative 'findsrc' - - sources = Array.new - headers = Array.new --- -tg: (f0b3239..) t/ruby19 (depends on: master) |