diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
| commit | 16be434b0bec4d14a893010b46f56a64cab74cc1 (patch) | |
| tree | 25e77807d55c76d42817197d576349478ff500a5 /pkgs/tools/system | |
| parent | d76bc8ed15cfa21d9f1cc47a06ee1fe8ac86d6d3 (diff) | |
| parent | b0ada07f36abc21c990000b5cdbe780157d6b92b (diff) | |
Merge accepted cross compilation PRs into staging
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/tm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/ts/default.nix | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 3326f535b5f6c..3442dbb62b056 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -10,10 +10,6 @@ stdenv.mkDerivation { sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile ''; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - src = fetchurl { url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz; sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 97b35378673e5..cce18b5d54b44 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, -sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ stdenv, fetchurl +, sendmailPath ? "/run/wrappers/bin/sendmail" +}: stdenv.mkDerivation rec { @@ -7,10 +8,6 @@ stdenv.mkDerivation rec { installPhase=''make install "PREFIX=$out"''; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - patchPhase = '' sed -i s,/usr/sbin/sendmail,${sendmailPath}, mail.c ts.1 ''; |