From 96f72f94adb24b7fdb65c9666fb00c415c21205d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:31:40 -0400 Subject: [PATCH 1/8] retroarch: use prefixed pkg-config retroarch knows how to use the correct pkg-config, so this is no longer needed. --- pkgs/misc/emulators/retroarch/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index a9950a14b4d9..bfc2c338769c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; - # we use prefix-less pkg-config - PKG_CONF_PATH = "pkg-config"; - enableParallelBuilding = true; configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; From 7a8b3b8b642e88d9af35096524f509b0fb574785 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:34:31 -0400 Subject: [PATCH 2/8] perl-NetDBus: use prefixed pkg-config needed for c71ab32a678 --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3e44398f6a6..45dd55f488ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13717,6 +13717,10 @@ let sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb"; }); + postPatch = '' + substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG + ''; + meta = { homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; From da8e9918364f2b63f689254d95d7c4b286baedf6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:36:24 -0400 Subject: [PATCH 3/8] crda: use prefixed pkg-config --- pkgs/os-specific/linux/crda/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 5811e9358b01..137e88cd6e87 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -31,7 +31,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs utils/ - substituteInPlace Makefile --replace ldconfig true + substituteInPlace Makefile \ + --replace ldconfig true \ + --replace pkg-config $PKG_CONFIG sed -i crda.c \ -e "/\/usr\/.*\/regulatory.bin/d" \ -e "s|/lib/crda|${wireless-regdb}/lib/crda|g" From 8f0c1adda237839178e7801c64173c3b64388429 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:37:22 -0400 Subject: [PATCH 4/8] pulseaudio: use prefixed pkg-config --- pkgs/servers/pulseaudio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e15efd4b47d1..513249cb7ad5 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -61,6 +61,11 @@ stdenv.mkDerivation rec { ++ lib.optional zeroconfSupport avahi ); + prePatch = '' + substituteInPlace bootstrap.sh \ + --replace pkg-config $PKG_CONFIG + ''; + autoreconfPhase = '' # Performs an autoreconf patchShebangs bootstrap.sh From 95930fe8573cd024179d934b0d8d59251ce66b7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:38:06 -0400 Subject: [PATCH 5/8] openldap: set CC for cross compilation --- pkgs/development/libraries/openldap/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a4274f064e56..d4e2e0aefd67 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { "STRIP=" "prefix=$(out)" "moduledir=$(out)/lib/modules" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + "CC=${stdenv.cc.targetPrefix}cc" + ]; configureFlags = [ "--enable-overlays" From 34e4d0fd98aa66a0f46a6eb96dabadbbd44294b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:39:29 -0400 Subject: [PATCH 6/8] avahi: use prefixed pkg-config --- pkgs/development/libraries/avahi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 4c7e5321f555..c401408406a1 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; + prePatch = '' + substituteInPlace configure \ + --replace pkg-config "$PKG_CONFIG" + ''; + patches = [ ./no-mkdir-localstatedir.patch (fetchpatch { From 1a835f911b309c3a44a86ff6652cbc9502bfd772 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:40:00 -0400 Subject: [PATCH 7/8] SDL2: get native wayland-scanner --- pkgs/development/libraries/SDL2/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 5f3d42b4da37..40fe1c42d7a6 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -42,9 +42,14 @@ stdenv.mkDerivation rec { substituteInPlace include/SDL_opengl_glext.h \ --replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \ --replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;" + + substituteInPlace configure \ + --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' ''; - nativeBuildInputs = [ pkgconfig ]; + depsBuildBuild = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig wayland ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; From 3f41da9b38af0324aa66a8c443373a308b0f8552 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 24 Jun 2020 20:53:07 -0400 Subject: [PATCH 8/8] strace: use host perl perl needs to be in buildInputs for patchShebangs to work properly --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 23700a2ddc2d..cbae92dd6d13 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k - postPatch = "patchShebangs strace-graph"; + postPatch = "patchShebangs --host strace-graph"; configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";