| 11 Nov 2021 |
 Artturin | prebuilt gtk-update-icon-cache on the build system | 21:17:58 |
| Artturin | weird | 21:17:59 |
| Artturin | we dont hit that error though | 21:18:07 |
| Artturin | because we dont reconfigure? | 21:19:04 |
| Artturin | trying autoreconfHook | 21:19:07 |
| Artturin | fail https://gist.github.com/Artturin/c0229dc69cbc3f9f47d3a800b592c2a2 | 21:22:00 |
 Rick (Mindavi) | All kind of gtk_doc stuff, hmm | 21:23:53 |
| Rick (Mindavi) | I'm not very familiar with automake or configure as a build system, I typically do some hacks here and there, but don't actually properly understand it | 21:24:30 |
| Rick (Mindavi) | But I remember there's a tool in the suite that tries to 'modernize' the script, maybe that's an option? | 21:24:57 |
| Rick (Mindavi) | (just speculating here) | 21:25:13 |
| Artturin | autoconf thats what im trying now | 21:25:50 |
| Artturin | * autoupdate thats what im trying now | 21:26:15 |
| Artturin | gtk+-aarch64-unknown-linux-gnu> autoupdate: running: /nix/store/2ysk871hamhwb8npzrycpbpdp77dkdws-gnum4-1.4.19/bin/m4 --include=/build/aubgaQ0H --include=/nix/store/8rklm7p7qchladj5jb
mwzrvjfbm4z6af-autoconf-2.69/share/autoconf /build/aubgaQ0H/input.m4 > /build/aubgaQ0H/updated
gtk+-aarch64-unknown-linux-gnu> configure.ac:159: warning: Instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE',
gtk+-aarch64-unknown-linux-gnu> you should use `AC_LANG_PUSH' and `AC_LANG_POP'.
gtk+-aarch64-unknown-linux-gnu> /nix/store/2ysk871hamhwb8npzrycpbpdp77dkdws-gnum4-1.4.19/bin/m4:/build/aubgaQ0H/input.m4:670: ERROR: end of file in string
gtk+-aarch64-unknown-linux-gnu> autoupdate: /nix/store/2ysk871hamhwb8npzrycpbpdp77dkdws-gnum4-1.4.19/bin/m4 failed with exit status: 1
| 21:59:37 |
| Artturin | diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index bbf20d60970..2a41848a732 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -1,5 +1,5 @@
{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk-pixbuf, xlibsWrapper, gobject-introspection
+, gdk-pixbuf, xlibsWrapper, gobject-introspection, buildPackages, autoreconfHook269
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
gtkCleanImmodulesCache
];
- nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
+ depsBuildBuild = [ buildPackages.stdenv.cc pkg-config ];
+ nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection autoreconfHook269 ];
patches = [
./patches/2.0-immodules.cache.patch
@@ -61,9 +62,15 @@ stdenv.mkDerivation rec {
++ optionals cupsSupport [ cups ]
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
- preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
- MACOSX_DEPLOYMENT_TARGET=10.16
- '' else null;
+ preAutoreconf = ''
+ autoupdate --force --verbose
+ autoupdate --force --verbose *.m4
+ autoupdate --force --verbose m4/*.m4
+ '';
+
+ preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) ''
+ MACOSX_DEPLOYMENT_TARGET=10.16
+ '';
configureFlags = [
"--with-gdktarget=${gdktarget}"
| 21:59:53 |
 symphorien | You could use older autoreconfhook alternatively | 22:07:45 |
| symphorien | Nixpkgs has 3 versions iirc | 22:07:59 |
| Artturin | i used 269 because it said the file was generated with it | 22:12:01 |
| Artturin | other distros run autogen https://github.com/archlinux/svntogit-packages/blob/da001b08371f2dd1c64aaf1767af0ea9e3c6cdf1/trunk/PKGBUILD#L37 | 22:20:09 |
| Artturin | but we dont even have that file | 22:20:24 |
| Artturin | * but we dont even have that file
will try
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gtk";
rev = "68631945733158f164427db84f01301d7e875763";
sha256 = "sha256-PFSW5x1krevEBY66AutYUD/upcTLUbbDw3zQsVlA3Zg=";
};
| 22:30:14 |
| Artturin | diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index bbf20d60970..23a1b556bfa 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -1,5 +1,5 @@
-{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk-pixbuf, xlibsWrapper, gobject-introspection
+{ config, lib, substituteAll, stdenv, fetchFromGitLab, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
+, gdk-pixbuf, xlibsWrapper, gobject-introspection, buildPackages, autoreconfHook269, gtk-doc
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -23,9 +23,12 @@ stdenv.mkDerivation rec {
pname = "gtk+";
version = "2.24.33";
- src = fetchurl {
- url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
- sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto=";
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
+ repo = "gtk";
+ rev = "68631945733158f164427db84f01301d7e875763";
+ sha256 = "sha256-PFSW5x1krevEBY66AutYUD/upcTLUbbDw3zQsVlA3Zg=";
};
outputs = [ "out" "dev" "devdoc" ];
@@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
gtkCleanImmodulesCache
];
- nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
+ nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection autoreconfHook269 gtk-doc ];
patches = [
./patches/2.0-immodules.cache.patch
@@ -61,9 +64,13 @@ stdenv.mkDerivation rec {
++ optionals cupsSupport [ cups ]
++ optionals stdenv.isDarwin [ AppKit Cocoa ];
- preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
- MACOSX_DEPLOYMENT_TARGET=10.16
- '' else null;
+ preAutoreconf = ''
+ NOCONFIGURE=1 ./autogen.sh
+ '';
+
+ preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) ''
+ MACOSX_DEPLOYMENT_TARGET=10.16
+ '';
configureFlags = [
"--with-gdktarget=${gdktarget}"
| 22:44:54 |
| Artturin | with this i get to
gtk+-aarch64-unknown-linux-gnu> *** gtkbuiltincache.h is not in the tree, and cannot be built
gtk+-aarch64-unknown-linux-gnu> *** because you don't have libpng, or (when cross-compiling) you
gtk+-aarch64-unknown-linux-gnu> *** don't have a prebuilt gtk-update-icon-cache on the build system.
| 22:45:09 |
| 12 Nov 2021 |
| Rick (Mindavi) | Hmm, so it keeps asking for that binary regardless 😕 | 06:24:51 |
 sterni | lib.systems.elaborate { system = "riscv64-none-elf" ; } != lib.systems.elaborate { system = "riscv64-unknown-none-elf" ; } | 15:34:52 |
| sterni | Alyssa Ross: smells like a bug? | 15:35:01 |
| sterni | the latter yields riscv64-none without the elf as the system | 15:36:33 |
 Alyssa Ross | I didn't know system could take that sort of format | 16:05:47 |
| sterni | I think the second part of system can have any number of dashes in practice | 16:14:15 |
| sterni | well, what do I know | 16:14:38 |
| sterni | funilly I've seen riscv64-unknown-elf for this a lot | 16:14:57 |
