diff options
Diffstat (limited to 'pkgs/applications/graphics/hugin')
| -rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 134c6ae49d4..9097a5d25a5 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -15,29 +15,9 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lrt"; - # I added these flags to get all the rpaths right, which I guess they are - # taken from the qt4 sources. Not very nice. - cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" + - " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" + - " -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" + - " -ljpeg -ltiff -lz -lexiv2 -lboost_thread\"" + - " -DCMAKE_SKIP_BUILD_RPATH=ON" + - " -DCMAKE_BUILD_TYPE=Release" + - " -DCMAKE_INSTALL_PREFIX=$out"; - - buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ilmbase ]; - - dontUseCmakeConfigure = true; - - # I rewrote the configure phase to get the $out references evaluated in - # cmakeFlags - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; + buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig + exiv2 gettext ilmbase ]; + postInstall = '' ensureDir "$out/nix-support" echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages |