diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-09-12 11:53:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 11:53:10 +0200 |
| commit | 2e85da905bcaaf8acae98fb04bba7f1a548b1540 (patch) | |
| tree | 08882f35f1db3f61bb1dd11a2ca15d2378365e53 | |
| parent | bfc017500eb02b2550f238e56ad4e3182c647a92 (diff) | |
| parent | 3a6d60dcafa96fc1ff7e0c5af1d20b1aa336e5e1 (diff) | |
| download | nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.tar nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.tar.gz nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.tar.bz2 nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.tar.lz nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.tar.xz nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.tar.zst nixpkgs-2e85da905bcaaf8acae98fb04bba7f1a548b1540.zip | |
Merge pull request #190170 from SuperSandro2000/mpd
| -rw-r--r-- | pkgs/development/libraries/libid3tag/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index df564812178..57786cad761 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib, gperf}: +{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: stdenv.mkDerivation rec { pname = "libid3tag"; @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; setOutputFlags = false; - propagatedBuildInputs = [ zlib gperf ]; + strictDeps = true; + + nativeBuildInputs = [ gperf_3_0 ]; + + buildInputs = [ zlib ]; patches = [ ./debian-patches.patch diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9be43ee501d..82bdc7a31f8 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages # Darwin inputs , AudioToolbox, AudioUnit # Inputs @@ -145,6 +145,8 @@ let ] ++ concatAttrVals features_ nativeFeatureDependencies; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cce4cadc4d..982505c23e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19807,9 +19807,7 @@ with pkgs; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; - libid3tag = callPackage ../development/libraries/libid3tag { - gperf = gperf_3_0; - }; + libid3tag = callPackage ../development/libraries/libid3tag { }; libidn = callPackage ../development/libraries/libidn { }; |