diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-03-17 07:59:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 07:59:41 +0100 |
| commit | 6f226a87251711577bbddf58cceaf4350a2c5b15 (patch) | |
| tree | ec8f2032d14ca59f21ac4ccae72c07dea0a02d1f /pkgs | |
| parent | cc012b227f47cb1913a446d95bb699967f027e71 (diff) | |
| parent | e022cc6541c6b6b9321e8eed001500671c495d9c (diff) | |
| download | nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.tar nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.tar.gz nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.tar.bz2 nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.tar.lz nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.tar.xz nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.tar.zst nixlib-6f226a87251711577bbddf58cceaf4350a2c5b15.zip | |
Merge pull request #23954 from jbaum98/pdfpc-darwin
pdfpc, libgee_0_8: Add darwin support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/pdfpc/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/libgee/default.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 2f023412faf5..49bcd4fe90a7 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig vala ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler - libpthreadstubs makeWrapper librsvg ]; + libpthreadstubs makeWrapper librsvg pcre ]; + + cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF"; postInstall = '' wrapProgram $out/bin/pdfpc \ @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { homepage = https://pdfpc.github.io/; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix index 7b49af3c50ff..d4697c99a938 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } |