The attached patch to phonon adds a fragment of the change from staging sufficient to fix the kde5 build in current master, without patching paths in includes.
This will make kde5 components (eg dolphin, gwenview) build in master until the staging arrives.
>From 356a3dd9a6aea672adf8a234e60f5fa9a33b75c9 Mon Sep 17 00:00:00 2001 From: Karn Kallio <[email protected]> Date: Mon, 25 Apr 2016 01:00:06 -0430 Subject: [PATCH] phonon : fix configuration paths --- pkgs/development/libraries/phonon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 3c731ca..db4c237 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -i PhononConfig.cmake.in \ -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "s,\\(set(PHONON_INCLUDE_DIR\\).*$,\\1 \"''${!outputDev}/include\")," \ - -e "s,\\(set(PHONON_LIBRARY_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," \ - -e "s,\\(set(PHONON_BUILDSYSTEM_DIR\\).*$,\\1 \"''${!outputDev}/share/phonon${if withQt5 then "4qt5" else ""}/buildsystem\")," + -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \ + -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \ + -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev}," ''; } -- 2.8.0
_______________________________________________ nix-dev mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-dev
