nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151189 from NickCao/gtk2

Browse Source 
gtk2: fix cross compilation
This commit is contained in:
Janne Heß 2021-12-18 21:34:40 +01:00 committed by GitHub
commit 9704751401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
, AppKit, Cocoa , AppKit, Cocoa
, fetchpatch , fetchpatch, buildPackages
}: }:
with lib; with lib;
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
gtkCleanImmodulesCache gtkCleanImmodulesCache
]; ];
nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
patches = [ patches = [
@ -72,6 +73,9 @@ stdenv.mkDerivation rec {
"--disable-glibtest" "--disable-glibtest"
"--disable-introspection" "--disable-introspection"
"--disable-visibility" "--disable-visibility"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"ac_cv_path_GTK_UPDATE_ICON_CACHE=${buildPackages.gtk2}/bin/gtk-update-icon-cache"
"ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
]; ];
doCheck = false; # needs X11 doCheck = false; # needs X11