git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21400 from johbo/darwin-xournal

Xournal: Darwin support

commit7d4e04c7950196e26dad5067045eb8a4cb2718f2 authorDaiderd Jordan <daiderd@gmail.com> dateTue 27 Dec 2016, 20:23 (10 years ago) parentaa18f24febab15
2 files changed+14−8
pkgs/applications/graphics/xournal/default.nix+7−5 pkgs/development/libraries/gtk+/2.x.nix+7−3
pkgs/applications/graphics/xournal/default.nix+7−5
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [
1515 ghostscript atk gtk2 glib fontconfig freetype
16− libgnomecanvas libgnomeprint libgnomeprintui
16+ libgnomecanvas
1717 pango libX11 xproto zlib poppler
18+ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
19+ libgnomeprint libgnomeprintui
1820 ];
1921
2022 nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
@@ -47,11 +49,11 @@ stdenv.mkDerivation rec {
4749 cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
4850 '';
4951
50− meta = {
52+ meta = with stdenv.lib; {
5153 homepage = http://xournal.sourceforge.net/;
5254 description = "Note-taking application (supposes stylus)";
53− maintainers = [ stdenv.lib.maintainers.guibert ];
54− license = stdenv.lib.licenses.gpl2;
55− platforms = stdenv.lib.platforms.linux;
55+ maintainers = [ maintainers.guibert ];
56+ license = licenses.gpl2;
57+ platforms = with platforms; linux ++ darwin;
5658 };
5759}
pkgs/development/libraries/gtk+/2.x.nix+7−3
@@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
3838 ++ optional xineramaSupport libXinerama
3939 ++ optionals cupsSupport [ cups ];
4040
41− configureFlags = if stdenv.isDarwin
42− then "--disable-glibtest --disable-introspection --disable-visibility"
43− else "--with-xinput=yes";
41+ configureFlags = [
42+ "--with-xinput=yes"
43+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
44+ "--disable-glibtest"
45+ "--disable-introspection"
46+ "--disable-visibility"
47+ ];
4448
4549 postInstall = ''
4650 moveToOutput share/gtk-2.0/demo "$devdoc"