diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-09-07 23:08:37 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-09-08 02:30:43 +0300 |
| commit | 24e4500fcdf39a17c723f2352de6a439181e044d (patch) | |
| tree | 782abd5d057b6d8013095e4350fb0e5322811a94 | |
| parent | c0f3a3ac7a31468f6b29466b4f504aa4f92b167c (diff) | |
| download | nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.tar nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.tar.gz nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.tar.bz2 nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.tar.lz nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.tar.xz nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.tar.zst nixpkgs-24e4500fcdf39a17c723f2352de6a439181e044d.zip | |
libid3tag: fix cross compile
| -rw-r--r-- | pkgs/development/libraries/libid3tag/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 8cedd1bcb41..d2e5b1ff071 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e50949aef8b..d6ba2a6d7bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,9 +19740,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 { }; |