diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 19:36:40 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 19:36:40 +0100 |
commit | f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92 (patch) | |
tree | 3f50a6f6b5cf4da2d5e9694e20b24a7226d7edb4 | |
parent | 21eb255af9fdc49770f6b1b35d236927bf393d0d (diff) | |
download | nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.tar nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.tar.gz nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.tar.bz2 nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.tar.lz nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.tar.xz nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.tar.zst nixpkgs-f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92.zip |
djvulibre: split dev and bin outputs
-rw-r--r-- | pkgs/applications/misc/djvulibre/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/search/recoll/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/pdfread/default.nix | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index b0f89cc5ea0..910b24358b4 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; }; + outputs = [ "dev" "out" "bin" ]; + buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 059c5eacc49..b8f4dbd7717 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace antiword ${antiword}/bin/antiword substituteInPlace $f --replace awk ${gawk}/bin/awk substituteInPlace $f --replace catppt ${catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused - substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt + substituteInPlace $f --replace djvused ${djvulibre.bin}/bin/djvused + substituteInPlace $f --replace djvutxt ${djvulibre.bin}/bin/djvutxt substituteInPlace $f --replace grep ${gnugrep}/bin/grep substituteInPlace $f --replace groff ${groff}/bin/groff substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index f35553ea168..13f9e30c8da 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ - --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin + --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin ''; meta = with stdenv.lib; { |