public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21400 from johbo/darwin-xournal

Browse Source 
Xournal: Darwin support
This commit is contained in:
Daiderd Jordan 2016-12-27 20:23:18 +01:00 committed by GitHub
commit 7d4e04c795
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/xournal/default.nix
View File

@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ghostscript atk gtk2 glib fontconfig freetype ghostscript atk gtk2 glib fontconfig freetype
libgnomecanvas libgnomeprint libgnomeprintui libgnomecanvas
pango libX11 xproto zlib poppler pango libX11 xproto zlib poppler
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
libgnomeprint libgnomeprintui
]; ];
nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
@ -47,11 +49,11 @@ stdenv.mkDerivation rec {
cp $out/share/xournal/pixmaps/xournal.png $out/share/icons cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://xournal.sourceforge.net/; homepage = http://xournal.sourceforge.net/;
description = "Note-taking application (supposes stylus)"; description = "Note-taking application (supposes stylus)";
maintainers = [ stdenv.lib.maintainers.guibert ]; maintainers = [ maintainers.guibert ];
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = with platforms; linux ++ darwin;
}; };
} }

10
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
++ optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama
++ optionals cupsSupport [ cups ]; ++ optionals cupsSupport [ cups ];
configureFlags = if stdenv.isDarwin configureFlags = [
then "--disable-glibtest --disable-introspection --disable-visibility" "--with-xinput=yes"
else "--with-xinput=yes"; ] ++ stdenv.lib.optionals stdenv.isDarwin [
"--disable-glibtest"
"--disable-introspection"
"--disable-visibility"
];
postInstall = '' postInstall = ''
moveToOutput share/gtk-2.0/demo "$devdoc" moveToOutput share/gtk-2.0/demo "$devdoc"