diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
| commit | 78b7529ee36603182ae34354d7cbc3dcfc228317 (patch) | |
| tree | 26a9555518aa403f9328dc1a72680e823e3630de /pkgs/tools/system | |
| parent | f3886a6fba7dec4d5c97a51558ab0a4489f89d76 (diff) | |
| parent | 4d4980d9f88956f533ecad905c92ab70f0e8cbad (diff) | |
| download | nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.gz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.bz2 nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.lz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.xz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.zst nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/dog/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/system/hardlink/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/smartmontools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/system/tm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/yeshup/default.nix | 2 |
5 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index d05e2986204c..a48c2678aa63 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056"; }; + patchPhase = '' + substituteInPlace Makefile \ + --replace "gcc" "cc" + ''; + installPhase = '' mkdir -p $out/bin mkdir -p $out/man/man1 diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index c34d81f63536..f464b7e9320e 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin $out/share/man/man1 - gcc -O2 hardlink.c -o $out/bin/hardlink + cc -O2 hardlink.c -o $out/bin/hardlink mv hardlink.1 $out/share/man/man1/hardlink.1 ''; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 8445767e7b78..cc30cd7a4881 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, IOKit ? null }: let version = "6.4"; @@ -18,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza"; }; + buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; + patchPhase = '' cp ${driverdb} drivedb.h sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index a297f9371001..3326f535b5f6 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -6,7 +6,9 @@ stdenv.mkDerivation { installPhase=''make install "PREFIX=$out"''; - patchPhase = ''sed -i 's@/usr/bin/install@install@g' Makefile''; + patchPhase = '' + sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile + ''; crossAttrs = { makeFlags = "CC=${stdenv.cross.config}-gcc"; diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix index 806d6cc5b945..8cea90b6758d 100644 --- a/pkgs/tools/system/yeshup/default.nix +++ b/pkgs/tools/system/yeshup/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/RhysU/yeshup; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.cc-by-sa-30; # From Stackoverflow answer maintainers = with maintainers; [ obadz ]; }; |