Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aa18f24f4b29
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d4e04c79501
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 27, 2016

  1. Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    Copy the full SHA
    346c1db View commit details
  2. gtk2: Enable xinput for Darwin

    johbo committed Dec 27, 2016
    Copy the full SHA
    febab15 View commit details
  3. Merge pull request #21400 from johbo/darwin-xournal

    Xournal: Darwin support
    LnL7 authored Dec 27, 2016
    Copy the full SHA
    7d4e04c View commit details
Showing with 14 additions and 8 deletions.
  1. +7 −5 pkgs/applications/graphics/xournal/default.nix
  2. +7 −3 pkgs/development/libraries/gtk+/2.x.nix
12 changes: 7 additions & 5 deletions pkgs/applications/graphics/xournal/default.nix
Original file line number Diff line number Diff line change
@@ -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;
};
}
10 changes: 7 additions & 3 deletions pkgs/development/libraries/gtk+/2.x.nix
Original file line number Diff line number Diff line change
@@ -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"