diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 17:26:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:53 -0400 |
| commit | 531e4b80c97002a542beb8fe356177ebd66cdd8e (patch) | |
| tree | 4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/tools/package-management | |
| parent | fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff) | |
| download | nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2 nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst nixpkgs-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip | |
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
Only acts on one-line dependency lists.
Diffstat (limited to 'pkgs/tools/package-management')
4 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index f260241fe6b..830c576c406 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id"; }; - buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 2a6a0dcc78a..98d1802f881 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa"; }; - buildInputs = [ socat pkgconfig dysnomia disnix getopt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ socat dysnomia disnix getopt ]; meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 388942f6ad8..70cd83b87a3 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -13,7 +13,8 @@ buildRustPackage rec { sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; }; depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl"; - buildInputs = [pkgconfig openssl curl]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl curl]; postInstall = '' mkdir -p $out/etc/profile.d diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 78d815eb7c1..860be0e1f79 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; |