gnome2.gtksourceview: unpin autotools
This commit is contained in:
parent
0382d0a27b
commit
8bda549f22
@ -33,9 +33,7 @@ lib.makeScope pkgs.newScope (
|
||||
|
||||
#### DESKTOP
|
||||
|
||||
gtksourceview = callPackage ./desktop/gtksourceview {
|
||||
autoreconfHook = pkgs.autoreconfHook269;
|
||||
};
|
||||
gtksourceview = callPackage ./desktop/gtksourceview { };
|
||||
|
||||
}
|
||||
)
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
gtk-doc,
|
||||
pkg-config,
|
||||
atk,
|
||||
cairo,
|
||||
@ -48,10 +49,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Fix build with gcc 14
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoreconfHook ];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
pkg-config
|
||||
intltool
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
autoreconfHook
|
||||
gtk-doc
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
atk
|
||||
@ -68,10 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk-mac-integration-gtk2
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
intltoolize --force
|
||||
'';
|
||||
|
||||
doCheck = false; # requires X11 daemon
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user