diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-14 15:24:37 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:54 -0400 |
commit | ed14223f8c30c014190e87914126578babd94c3e (patch) | |
tree | a0cf6d519d4d4d8507b204076ae5b0dad40f0d18 /pkgs/os-specific/linux | |
parent | 7a733ceda45d9e7842685523cfebeee07aaa3f97 (diff) | |
download | nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.tar nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.tar.gz nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.tar.bz2 nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.tar.lz nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.tar.xz nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.tar.zst nixpkgs-ed14223f8c30c014190e87914126578babd94c3e.zip |
treewide: Manual fix more pkg-config build-inputs
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/btfs/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/directvnc/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/eudev/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/xsensors/default.nix | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index e51cc582ccf..6cc4dc6f6d5 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost autoreconfHook pkgconfig + boost autoreconfHook fuse libtorrentRasterbar curl ]; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index 4c47104c5b6..a63aceedee3 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig directfb zlib libjpeg xproto + directfb zlib libjpeg xproto ]; meta = { diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 9e61c377ecf..091a0d4b46f 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -8,13 +8,15 @@ let url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib pkgconfig gperf utillinux + glib gperf utillinux ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index a392d065e41..5f7bca097bf 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 pkgconfig lm_sensors + gtk2 lm_sensors ]; patches = [ ./remove-unused-variables.patch |