diff options
| author | Florian Klink <flokli@flokli.de> | 2021-01-01 22:11:29 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2021-01-01 23:17:56 +0100 |
| commit | 767252d232503a56c64e6f71fbb7c9bb8e030be4 (patch) | |
| tree | efa38791b65156f75d0f637002b98f9660b49832 /pkgs/servers/pulseaudio | |
| parent | 033cfcce150fb295274a08c1e18dbdfd4ec110c5 (diff) | |
| download | nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.tar nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.tar.gz nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.tar.bz2 nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.tar.lz nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.tar.xz nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.tar.zst nixpkgs-767252d232503a56c64e6f71fbb7c9bb8e030be4.zip | |
pulseaudio: fix cross compilation by disabling gsettings when cross-compiling
When cross-compiling, pulseaudio seems to not find some m4 macro providing GSETTINGS_RULES. However, apart from the obviously missing gsettings support, this works just fine.
Diffstat (limited to 'pkgs/servers/pulseaudio')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 70a964039fc..625e2e0e8ca 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -93,7 +93,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" - ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"; + ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-gsettings"; enableParallelBuilding = true; @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString (stdenv.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' wrapProgram $out/libexec/pulse/gsettings-helper \ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" |