diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-04-10 08:50:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 08:50:15 +0200 |
| commit | f8230518a2618963d3fcd2278b773c4dc075c1ba (patch) | |
| tree | 40157638377b2bae7df815296b88206942133c7c /pkgs/applications/graphics | |
| parent | 3766b8773733d67b9035810a03a3afe74490fade (diff) | |
| parent | dd25b6da62ca6bb6a28a87a39e3505cf6b6a933a (diff) | |
| download | nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.tar nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.tar.gz nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.tar.bz2 nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.tar.lz nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.tar.xz nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.tar.zst nixlib-f8230518a2618963d3fcd2278b773c4dc075c1ba.zip | |
Merge pull request #24762 from matthewbauer/darwin-misc-fixes
darwin: miscellaneous fixes
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/djview/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 85c0f58174a4..2b0dde210c58 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig -, djvulibre, qt4, xorg, libtiff }: +, djvulibre, qt4, xorg, libtiff +, darwin }: stdenv.mkDerivation rec { name = "djview-${version}"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]; + buildInputs = [ djvulibre qt4 xorg.libXt libtiff ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; |