Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use hostPackages.{autoconf,automake} as build tools #372700

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Don't use hostPackages.{autoconf,automake} as build tools #372700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eeba57
xorg.{utilmacros,xkeyboardconfig}: treat autotools as native inputs
avnik Jan 10, 2025
1c29d68
aalib: cleanup, config.{sub,guess} updated by stdenv hook now
avnik Jan 10, 2025
81806a9
ladspaPlugins: fix cross-compilation for aarch64
avnik Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkgs/applications/audio/ladspa-plugins/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
autoreconfHook,
automake,
fftw,
ladspaH,
libxml2,
Expand All @@ -25,19 +24,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkg-config
perlPackages.perl
perlPackages.XMLParser
];
buildInputs = [
fftw
ladspaH
libxml2
perlPackages.perl
perlPackages.XMLParser
];

patchPhase = ''
postPatch = ''
patchShebangs .
patchShebangs ./metadata/
cp ${automake}/share/automake-*/mkinstalldirs .
substituteInPlace util/Makefile.am --replace-fail "ranlib" "$RANLIB"
substituteInPlace gsm/Makefile.am --replace-fail "ranlib" "$RANLIB"
substituteInPlace gverb/Makefile.am --replace-fail "ranlib" "$RANLIB"
'';

meta = with lib; {
Expand Down
5 changes: 0 additions & 5 deletions pkgs/by-name/if/iftop/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
fetchurl,
ncurses,
libpcap,
automake,
nixosTests,
}:

Expand All @@ -21,10 +20,6 @@ stdenv.mkDerivation rec {
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s";

preConfigure = ''
cp ${automake}/share/automake*/config.{sub,guess} config
'';

buildInputs = [
ncurses
libpcap
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ self: super:
transset = addMainProgram super.transset { };

utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ];
propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [] ++ [ automake autoconf libtool ];
});

viewres = addMainProgram super.viewres { };
Expand Down Expand Up @@ -725,7 +725,7 @@ self: super:
'';
in
xorg.xkeyboardconfig.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ automake ];
nativeBuildInputs = old.nativeBuildInputs ++ [ automake ];
postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts);
});

Expand Down