diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index d49dd646fc53..1a54fa2b25dd 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildPackages , fetchFromGitHub , nix-update-script , substituteAll @@ -120,7 +121,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace autogen.sh \ - --replace "which" "${busybox}/bin/which" + --replace "which" "${buildPackages.busybox}/bin/which" substituteInPlace src/shared-data-manager.c \ --replace /bin/rm ${busybox}/bin/rm diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 119d3edfdc2e..2a26c24ccb36 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation { # Create symlinks for rest of the binaries. + '' - for binary in objdump objcopy size strings as nm gprof dwp c++filt addr2line ranlib readelf elfedit; do + for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line ranlib readelf elfedit; do if [ -e $ldPath/${targetPrefix}''${binary} ]; then ln -s $ldPath/${targetPrefix}''${binary} $out/bin/${targetPrefix}''${binary} fi diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index efe9640af6fd..4bd7a67871f9 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -10,6 +10,7 @@ , systemd , coreutils , meson +, mesonEmulatorHook , dbus , ninja , python3 @@ -47,7 +48,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - dbus gettext gobject-introspection meson @@ -55,9 +55,14 @@ stdenv.mkDerivation rec { pkg-config python3 vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # meson.build:88:2: ERROR: Can not run test applications in this cross environment. + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection + dbus glib polkit systemd