From c7126b63af50eb3e080b5c3f43066b2ebc9d97e1 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 26 Sep 2010 06:59:13 +0000 Subject: [PATCH] Amarok: make scripts work, prettify the builder svn path=/nixpkgs/trunk/; revision=23936 --- pkgs/desktops/kde-4.4/extragear/amarok/builder.sh | 9 --------- pkgs/desktops/kde-4.4/extragear/amarok/default.nix | 10 +++++++++- 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/extragear/amarok/builder.sh diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/builder.sh b/pkgs/desktops/kde-4.4/extragear/amarok/builder.sh deleted file mode 100644 index c19ba33ffcfc..000000000000 --- a/pkgs/desktops/kde-4.4/extragear/amarok/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake - sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix index 87bb9a1908c7..9650319466e9 100644 --- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix @@ -9,9 +9,17 @@ stdenv.mkDerivation { }; inherit mysql loudmouth; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - builder = ./builder.sh; + buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2]; + patchPhase = '' + sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake + sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake + ''; + postInstall = '' + mkdir -p $out/nix-support + echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages + ''; meta = { description = "Popular music player for KDE"; license = "GPL";