From 1fe2a68224d3a28e79cb007805882f0e15c83526 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Mar 2014 14:51:05 +0100
Subject: [PATCH] quodlibet: Fix evaluation

http://hydra.nixos.org/build/9400950
---
 pkgs/applications/audio/quodlibet/default.nix       | 6 ++++--
 pkgs/development/python-modules/generic/default.nix | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index de1aba2a7f6f..ea8ae88f022e 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
   # XXX, tests fail
   doCheck = false;
 
-  src = [
+  srcs = [
     (fetchurl {
       url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz";
       sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z";
@@ -27,7 +27,7 @@ buildPythonPackage {
       url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz";
       sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc";
      })
-  ];       
+  ];
 
   preConfigure = ''
     # 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}";
+
   postUnpack = ''
     # the patch searches for plugins in directory ../plugins
     # so link the appropriate directory there
     ln -sf quodlibet-plugins-${version} plugins
   '';
+
   patches = [ ./quodlibet-package-plugins.patch ];
 
   buildInputs = stdenv.lib.optionals withGstPlugins [
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 45c8653bc198..d0234c29ed9a 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -56,7 +56,7 @@ python.stdenv.mkDerivation (attrs // {
     python wrapPython setuptools
     (distutils-cfg.override { extraCfg = distutilsExtraCfg; })
   ] ++ buildInputs ++ pythonPath
-    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name) unzip);
+    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
   propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];