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

quodlibet: Fix evaluation 

http://hydra.nixos.org/build/9400950
This commit is contained in:
Eelco Dolstra 2014-03-10 14:51:05 +01:00
parent 2297f31339
commit 1fe2a68224
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/quodlibet/default.nix
View File

@ -18,7 +18,7 @@ buildPythonPackage {
# XXX, tests fail # XXX, tests fail
doCheck = false; doCheck = false;
src = [ srcs = [
(fetchurl { (fetchurl {
url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz"; url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz";
sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z"; sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z";
@ -27,7 +27,7 @@ buildPythonPackage {
url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz"; url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz";
sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc"; sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc";
}) })
]; ];
preConfigure = '' preConfigure = ''
# TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
@ -35,11 +35,13 @@ buildPythonPackage {
''; '';
sourceRoot = "quodlibet-${version}"; sourceRoot = "quodlibet-${version}";
postUnpack = '' postUnpack = ''
# the patch searches for plugins in directory ../plugins # the patch searches for plugins in directory ../plugins
# so link the appropriate directory there # so link the appropriate directory there
ln -sf quodlibet-plugins-${version} plugins ln -sf quodlibet-plugins-${version} plugins
''; '';
patches = [ ./quodlibet-package-plugins.patch ]; patches = [ ./quodlibet-package-plugins.patch ];
buildInputs = stdenv.lib.optionals withGstPlugins [ buildInputs = stdenv.lib.optionals withGstPlugins [

2
pkgs/development/python-modules/generic/default.nix
View File

@ -56,7 +56,7 @@ python.stdenv.mkDerivation (attrs // {
python wrapPython setuptools python wrapPython setuptools
(distutils-cfg.override { extraCfg = distutilsExtraCfg; }) (distutils-cfg.override { extraCfg = distutilsExtraCfg; })
] ++ buildInputs ++ pythonPath ] ++ buildInputs ++ pythonPath
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name) unzip); ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];