diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-06 23:32:13 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-08-18 21:37:25 +0200 |
commit | 2286655abd99b87d9a3c23d946f2b7c8f6572504 (patch) | |
tree | fe9adc0b4543dc606d17664cce3ac2f19d9a0023 /pkgs | |
parent | 955f391e29ada1d3a0ca4b345dae7ddef64167ec (diff) | |
download | nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.tar nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.tar.gz nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.tar.bz2 nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.tar.lz nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.tar.xz nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.tar.zst nixlib-2286655abd99b87d9a3c23d946f2b7c8f6572504.zip |
gtk3: add x11Support for darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index a384e46fb147..4bf42e1b5b65 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -2,7 +2,7 @@ , gdk_pixbuf, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null -, gdktarget ? "x11" +, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch }: diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 21f9adfdc8e3..22e48c8ba7a6 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection -, xorg, epoxy, json-glib, libxkbcommon, gmp +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 +, x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null -, darwin, gnome3 +, AppKit, Cocoa }: assert cupsSupport -> cups != null; @@ -36,12 +37,12 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json-glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ] + ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? @@ -55,9 +56,9 @@ stdenv.mkDerivation rec { "--disable-debug" "--disable-dependency-tracking" "--disable-glibtest" - "--with-gdktarget=quartz" + ] ++ optional (stdenv.isDarwin && !x11Support) "--enable-quartz-backend" - ] ++ optional stdenv.isLinux [ + ++ optional x11Support [ "--enable-x11-backend" ] ++ optional waylandSupport [ "--enable-wayland-backend" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ab22e40b0b3..81841abdddf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9671,7 +9671,6 @@ with pkgs; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; - gdktarget = if stdenv.isDarwin then "quartz" else "x11"; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -9679,7 +9678,9 @@ with pkgs; gdktarget = "x11"; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; @@ -17320,7 +17321,7 @@ with pkgs; minitube = libsForQt5.callPackage ../applications/video/minitube { }; - mimic = callPackage ../applications/audio/mimic { + mimic = callPackage ../applications/audio/mimic { pulseaudioSupport = config.pulseaudio or false; }; |