diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-12 21:17:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-12 21:17:53 +0200 |
| commit | df76cbaa212074427bb2ce33144afbfa7c9d5c3a (patch) | |
| tree | 9b1bf622a34545492818e60c7c4c389143734fef | |
| parent | 54c18db1ca85108c0bb8cc4f27e6254d4357b93e (diff) | |
| download | nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.tar nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.tar.gz nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.tar.bz2 nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.tar.lz nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.tar.xz nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.tar.zst nixlib-df76cbaa212074427bb2ce33144afbfa7c9d5c3a.zip | |
hugin, enblend-enfuse: enbaleParallelBuilding, default boost
Also unset meta.broken.
| -rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/graphics/enblend-enfuse/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 20d2b2a4b2d6..88912cbda55d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; + enableParallelBuilding = true; + # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake @@ -42,6 +44,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index fc9a22df548e..6b65d3df0d3f 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; + enableParallelBuilding = true; + meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 358cce02753f..8a0fd0ed737b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -964,9 +964,7 @@ let emv = callPackage ../tools/misc/emv { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { - boost = boost149; - }; + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; |