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: e755dc3fd733
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4488203d0c01
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 11, 2017

  1. gimp: add darwin support

    @matthewbauer
    matthewbauer committed Jan 11, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8497ef1 View commit details

  2. gtk-mac-bundler: init at 0.7.4

    @matthewbauer
    matthewbauer committed Jan 11, 2017
    Copy the full SHA
    21143cc View commit details

  3. Merge pull request #20658 from matthewbauer/gimp-darwin 

    GIMP on Darwin (use Quartz)
    @LnL7
    LnL7 authored Jan 11, 2017
    Copy the full SHA
    4488203 View commit details
Showing with 39 additions and 3 deletions.
  1. +5 −3 pkgs/applications/graphics/gimp/2.8.nix
  2. +31 −0 pkgs/development/tools/gtk-mac-bundler/default.nix
  3. +3 −0 pkgs/top-level/all-packages.nix
8 changes: 5 additions & 3 deletions pkgs/applications/graphics/gimp/2.8.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
, python2Packages, libart_lgpl, libexif, gettext, xorg }:
, python2Packages, libart_lgpl, libexif, gettext, xorg
, AppKit, Cocoa, gtk-mac-integration }:

let
inherit (python2Packages) pygtk wrapPython python;
@@ -26,7 +27,8 @@ in stdenv.mkDerivation rec {
libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext xorg.libXpm
wrapPython
];
]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];

pythonPath = [ pygtk ];

@@ -51,6 +53,6 @@ in stdenv.mkDerivation rec {
description = "The GNU Image Manipulation Program";
homepage = http://www.gimp.org/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}
31 changes: 31 additions & 0 deletions pkgs/development/tools/gtk-mac-bundler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ stdenv, lib, fetchFromGitHub }:

stdenv.mkDerivation rec {
name = "gtk-mac-bundler-${version}";
version = "0.7.4";

src = fetchFromGitHub {
owner = "GNOME";
repo = "gtk-mac-bundler";
rev = "bundler-${version}";
sha256 = "1kyyq2hc217i5vhbfff0ldgv0r3aziwryd1xlck5cw3s6hgskbza";
};

installPhase = ''
mkdir -p $out/bin
substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
--subst-var-by PATH $out/share
chmod a+x $out/bin/gtk-mac-bundler
mkdir -p $out/share
cp -r bundler $out/share
'';

meta = with lib; {
description = "a helper script that creates application bundles form GTK+ executables for Mac OS X";
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.darwin;
homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling;
license = licenses.gpl2;
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7539,6 +7539,8 @@ in
gtk = gtk2;
};

gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};

gtkspell2 = callPackage ../development/libraries/gtkspell { };

gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@@ -13350,6 +13352,7 @@ in
inherit (gnome2) libart_lgpl;
webkit = null;
lcms = lcms2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};

gimp = gimp_2_8;