diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-29 19:22:22 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-29 19:22:22 +0000 |
commit | 32f2dda5deadc5bae01e852d9e5c1c211a5164c7 (patch) | |
tree | 372e2074deecebe539d260818fde3035b9388464 /pkgs | |
parent | 48717cfa4f246c9a5cc2eef2ffea30bd3b05fca3 (diff) | |
download | nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.tar nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.tar.gz nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.tar.bz2 nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.tar.lz nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.tar.xz nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.tar.zst nixlib-32f2dda5deadc5bae01e852d9e5c1c211a5164c7.zip |
Fixing hugin (we now install boost without tags on library file names, and
the hugin expression still used the tag for 'multithread' in the boost library file names). svn path=/nixpkgs/trunk/; revision=18698
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index ae6b7a43d02d..134c6ae49d4e 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { 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-mt\"" + + " -ljpeg -ltiff -lz -lexiv2 -lboost_thread\"" + " -DCMAKE_SKIP_BUILD_RPATH=ON" + " -DCMAKE_BUILD_TYPE=Release" + " -DCMAKE_INSTALL_PREFIX=$out"; @@ -47,5 +47,7 @@ stdenv.mkDerivation { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } |