Merge pull request #33185 from obsidiansystems/cross-simple
treewide: A few misc cross changes from #26805
This commit is contained in:
commit
b1dcc6c201
@ -10,7 +10,7 @@ mkDerivation {
|
|||||||
license = [ lib.licenses.lgpl21 ];
|
license = [ lib.licenses.lgpl21 ];
|
||||||
maintainers = kdepimTeam;
|
maintainers = kdepimTeam;
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ extra-cmake-modules ki18n ];
|
nativeBuildInputs = [ extra-cmake-modules ];
|
||||||
buildInputs = [ kcodecs qtbase ];
|
buildInputs = [ kcodecs ki18n qtbase ];
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl
|
{ stdenv
|
||||||
, gettext, glibc
|
, fetchurl, autoreconfHook, gettext
|
||||||
, buildPlatform, hostPlatform
|
, buildPlatform, hostPlatform
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -17,12 +17,20 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
# Libelf's custom NLS macros fail to determine the catalog file extension on
|
configureFlags = []
|
||||||
# Darwin, so disable NLS for now.
|
# Configure check for dynamic lib support is broken, see
|
||||||
# FIXME: Eventually make Gettext a build input on all platforms.
|
# http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html
|
||||||
configureFlags = stdenv.lib.optional hostPlatform.isDarwin "--disable-nls";
|
++ stdenv.lib.optional (hostPlatform != buildPlatform) "mr_cv_target_elf=yes"
|
||||||
|
# Libelf's custom NLS macros fail to determine the catalog file extension
|
||||||
|
# on Darwin, so disable NLS for now.
|
||||||
|
++ stdenv.lib.optional hostPlatform.isDarwin "--disable-nls";
|
||||||
|
|
||||||
nativeBuildInputs = [ gettext ];
|
nativeBuildInputs = [ gettext ]
|
||||||
|
# Need to regenerate configure script with newer version in order to pass
|
||||||
|
# "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
|
||||||
|
# which doesn't work with the bootstrapTools bash, so can only do this
|
||||||
|
# for cross builds when `stdenv.shell` is a newer bash.
|
||||||
|
++ stdenv.lib.optional (hostPlatform != buildPlatform) autoreconfHook;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "ELF object file access library";
|
description = "ELF object file access library";
|
||||||
|
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
|
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ extra-cmake-modules ki18n ];
|
nativeBuildInputs = [ extra-cmake-modules ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
|
kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
|
||||||
kcmutils kio knotifications plasma-framework kwidgetsaddons
|
kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons
|
||||||
kwindowsystem kitemviews lcms2 libXrandr qtx11extras
|
kwindowsystem kitemviews lcms2 libXrandr qtx11extras
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags =
|
configureFlags =
|
||||||
# "pr" need not be on the PATH as a run-time dep, so we need to tell
|
# "pr" need not be on the PATH as a run-time dep, so we need to tell
|
||||||
# configure where it is. Covers the cross and native case alike.
|
# configure where it is. Covers the cross and native case alike.
|
||||||
stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr";
|
stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"
|
||||||
|
++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/diffutils/diffutils.html;
|
homepage = http://www.gnu.org/software/diffutils/diffutils.html;
|
||||||
|
@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
|
|||||||
(if interactive then "--with-readline=${readline.dev}" else "--without-readline")
|
(if interactive then "--with-readline=${readline.dev}" else "--without-readline")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
makeFlags = "AR=${stdenv.cc.targetPrefix}ar";
|
||||||
|
|
||||||
inherit doCheck;
|
inherit doCheck;
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user