diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-12-27 20:23:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 20:23:18 +0100 |
| commit | 7d4e04c7950196e26dad5067045eb8a4cb2718f2 (patch) | |
| tree | b2d1948c937401d42f8fb752158d7a81980032ec /pkgs | |
| parent | aa18f24f4b29e978de25817de1b087f145a14b66 (diff) | |
| parent | febab15b01fc2ed68e688e3819941a2c62091d8a (diff) | |
| download | nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.tar nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.tar.gz nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.tar.bz2 nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.tar.lz nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.tar.xz nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.tar.zst nixlib-7d4e04c7950196e26dad5067045eb8a4cb2718f2.zip | |
Merge pull request #21400 from johbo/darwin-xournal
Xournal: Darwin support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/xournal/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 669fc5a28a73..97b418f08c10 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk2 glib fontconfig freetype - libgnomecanvas libgnomeprint libgnomeprintui + libgnomecanvas pango libX11 xproto zlib poppler + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + libgnomeprint libgnomeprintui ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; @@ -47,11 +49,11 @@ stdenv.mkDerivation rec { cp $out/share/xournal/pixmaps/xournal.png $out/share/icons ''; - meta = { + meta = with stdenv.lib; { homepage = http://xournal.sourceforge.net/; description = "Note-taking application (supposes stylus)"; - maintainers = [ stdenv.lib.maintainers.guibert ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.guibert ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 91407e556c05..ba12b4eea93b 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -38,9 +38,13 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; - configureFlags = if stdenv.isDarwin - then "--disable-glibtest --disable-introspection --disable-visibility" - else "--with-xinput=yes"; + configureFlags = [ + "--with-xinput=yes" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "--disable-glibtest" + "--disable-introspection" + "--disable-visibility" + ]; postInstall = '' moveToOutput share/gtk-2.0/demo "$devdoc" |