From b4780249c64548dff25387d527f193a3b4f555bf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 23 May 2017 16:20:45 -0500 Subject: [PATCH] grantlee5: don't link plugins into $dev --- .../libraries/grantlee/5/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 571ad98c38c..6fae90a8d89 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -12,23 +12,18 @@ mkDerivation rec { name = "${name}.tar.gz"; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - outputs = [ "out" "dev" "bin" ]; - postInstall = '' - moveToOutput "$grantleePluginPrefix" "$bin" + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - # CMake checks that the provided libraries and plugins exist - # Link libraries into $dev to satisfy CMake - mkdir -p $dev/lib - find $out/lib -name '*.so.*' -exec ln -s \{\} $dev/lib \; - - # Link plugins into $dev to satisfy CMake - ln -s $bin/lib/grantlee $dev/lib - ''; + outputs = [ "out" "dev" ]; + postFixup = + # Disabuse CMake of the notion that libraries are in $dev + '' + sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ + -e "s|\''${_IMPORT_PREFIX}|$out|" + ''; setupHook = ./setup-hook.sh;