diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-10-29 14:00:31 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 17:06:00 -0400 |
| commit | 6971c503af84da630e518697740789cb4c38a46f (patch) | |
| tree | c5366d03809c4ecc565f7d70b4347e8779dd4b8d | |
| parent | d8c744b862e718ccf52ca6197a1c2383d77e9482 (diff) | |
| download | nixlib-6971c503af84da630e518697740789cb4c38a46f.tar nixlib-6971c503af84da630e518697740789cb4c38a46f.tar.gz nixlib-6971c503af84da630e518697740789cb4c38a46f.tar.bz2 nixlib-6971c503af84da630e518697740789cb4c38a46f.tar.lz nixlib-6971c503af84da630e518697740789cb4c38a46f.tar.xz nixlib-6971c503af84da630e518697740789cb4c38a46f.tar.zst nixlib-6971c503af84da630e518697740789cb4c38a46f.zip | |
runit: Enable cross-compilation
| -rw-r--r-- | pkgs/tools/system/runit/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/system/runit/fix-ar-ranlib.patch | 18 |
2 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index aa2f50f2df07..4d5de56fbf0d 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; }; + patches = [ + ./fix-ar-ranlib.patch + ]; + outputs = [ "out" "man" ]; sourceRoot = "admin/${name}"; @@ -34,8 +38,8 @@ stdenv.mkDerivation rec { cd src # Both of these are originally hard-coded to gcc - echo cc > conf-cc - echo cc > conf-ld + echo ${stdenv.cc.targetPrefix}cc > conf-cc + echo ${stdenv.cc.targetPrefix}cc > conf-ld ''; installPhase = '' diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/pkgs/tools/system/runit/fix-ar-ranlib.patch new file mode 100644 index 000000000000..c65a037d5242 --- /dev/null +++ b/pkgs/tools/system/runit/fix-ar-ranlib.patch @@ -0,0 +1,18 @@ +--- runit-2.1.2/src/print-ar.sh ++++ runit-2.1.2/src/print-ar.sh +@@ -1,7 +1,7 @@ + cat warn-auto.sh + echo 'main="$1"; shift' + echo 'rm -f "$main"' +-echo 'ar cr "$main" ${1+"$@"}' ++echo '$AR cr "$main" ${1+"$@"}' + case "`cat systype`" in + sunos-5.*) ;; + unix_sv*) ;; +@@ -10,5 +10,5 @@ case "`cat systype`" in + dgux-*) ;; + hp-ux-*) ;; + sco*) ;; +- *) echo 'ranlib "$main"' ;; ++ *) echo '$RANLIB "$main"' ;; + esac |