646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
--- gwyddion-2.55.orig/configure 2019-11-04 01:25:31.000000000 -0800
|
|
+++ gwyddion-2.55/configure 2020-03-20 18:49:43.860452655 -0700
|
|
@@ -18560,7 +18560,7 @@
|
|
fi
|
|
if test "x$embed_pygtk" = xno; then
|
|
if test "x$PYGTK_CODEGENDIR" = 'x'; then
|
|
- PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
|
|
+ PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
|
|
fi
|
|
else
|
|
# Some silly OSes want to remove pygtk2. We can build pygwy without
|
|
--- gwyddion-2.55.orig/configure.ac 2019-11-04 01:25:16.000000000 -0800
|
|
+++ gwyddion-2.55/configure.ac 2020-03-20 18:52:55.042724547 -0700
|
|
@@ -270,7 +270,7 @@
|
|
[embed_pygtk=yes; pygwy_warn=" (embedded pygtk2)"])
|
|
if test "x$embed_pygtk" = xno; then
|
|
if test "x$PYGTK_CODEGENDIR" = 'x'; then
|
|
- PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
|
|
+ PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
|
|
fi
|
|
else
|
|
# Some silly OSes want to remove pygtk2. We can build pygwy without
|