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

Darwin gtk quartz follow up (#21883)

Browse Source 
* gtk2-x11: Add gtk2 configuration with X11 backend

After making quartz the default for darwin, some builds started to fail since
they only support gtk with the X11 backend.

* apvlv: Use gtk2-x11 on darwin

* gpicview: Use gtk2-x11 for darwin

* lxappearance: Use gtk2-x11 for darwin

* fontforge-gtk: Use gtk2-x11 for darwin

* gbdfed: Use gtk2-x11 for darwin
This commit is contained in:
Johannes Bornhold 2017-01-14 23:53:56 +01:00 committed by zimbatm
parent 1fe51342a9
commit 8a7d373795
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
++ libintlOrEmpty ++ libintlOrEmpty
++ optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama
++ optionals cupsSupport [ cups ] ++ optionals cupsSupport [ cups ]
++ optionals (gdktarget == "quartz") [ AppKit Cocoa ]; ++ optionals stdenv.isDarwin [ AppKit Cocoa ];
configureFlags = [ configureFlags = [
"--with-gdktarget=${gdktarget}" "--with-gdktarget=${gdktarget}"

19
pkgs/top-level/all-packages.nix
View File

@ -1738,6 +1738,7 @@ in
}); });
fontforge-gtk = callPackage ../tools/misc/fontforge { fontforge-gtk = callPackage ../tools/misc/fontforge {
withGTK = true; withGTK = true;
gtk2 = gtk2-x11;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
}; };
@ -1842,7 +1843,7 @@ in
gazebo-headless = gazeboSimulator.gazebo6-headless; gazebo-headless = gazeboSimulator.gazebo6-headless;
gbdfed = callPackage ../tools/misc/gbdfed { gbdfed = callPackage ../tools/misc/gbdfed {
gtk = gtk2; gtk = gtk2-x11;
}; };
gdmap = callPackage ../tools/system/gdmap { }; gdmap = callPackage ../tools/system/gdmap { };
@ -5623,7 +5624,9 @@ in
kanif = callPackage ../applications/networking/cluster/kanif { }; kanif = callPackage ../applications/networking/cluster/kanif { };
lxappearance = callPackage ../desktops/lxde/core/lxappearance {}; lxappearance = callPackage ../desktops/lxde/core/lxappearance {
gtk2 = gtk2-x11;
};
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
@ -7512,6 +7515,10 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
}; };
gtk2-x11 = gtk2.override {
gdktarget = "x11";
};
gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
@ -13173,7 +13180,9 @@ in
gpa = callPackage ../applications/misc/gpa { }; gpa = callPackage ../applications/misc/gpa { };
gpicview = callPackage ../applications/graphics/gpicview { }; gpicview = callPackage ../applications/graphics/gpicview {
gtk2 = gtk2-x11;
};
gqrx = callPackage ../applications/misc/gqrx { }; gqrx = callPackage ../applications/misc/gqrx { };
@ -15668,7 +15677,9 @@ in
inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
}; };
apvlv = callPackage ../applications/misc/apvlv { }; apvlv = callPackage ../applications/misc/apvlv {
gtk2 = gtk2-x11;
};
xpdf = callPackage ../applications/misc/xpdf { xpdf = callPackage ../applications/misc/xpdf {
base14Fonts = "${ghostscript}/share/ghostscript/fonts"; base14Fonts = "${ghostscript}/share/ghostscript/fonts";