tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
I add back the arm unpack script
The unified made by ambro doesn't work for me in the sheevaplug.
+68
-1
+4
-1
pkgs/stdenv/linux/default.nix
+4
-1
pkgs/stdenv/linux/default.nix
···
44
44
45
45
builder = bootstrapFiles.busybox;
46
46
47
-
args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
47
+
args = if system == "armv5tel-linux" then
48
+
[ "ash" "-e" ./scripts/unpack-bootstrap-tools-arm.sh ]
49
+
else
50
+
[ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
48
51
49
52
tarball = bootstrapFiles.bootstrapTools;
50
53
+64
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
+64
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
···
1
+
set -e
2
+
3
+
# Unpack the bootstrap tools tarball.
4
+
echo Unpacking the bootstrap tools...
5
+
$builder mkdir $out
6
+
< $tarball $builder unxz | $builder tar x -C $out
7
+
8
+
# Set the ELF interpreter / RPATH in the bootstrap binaries.
9
+
echo Patching the bootstrap tools...
10
+
11
+
# On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So
12
+
# use a copy of patchelf.
13
+
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? $out/bin/cp $out/bin/patchelf .
14
+
15
+
for i in $out/bin/* $out/libexec/gcc/*/*/* $out/lib/librt*; do
16
+
if test ${i%.la} != $i; then continue; fi
17
+
if test ${i%*.so*} != $i; then continue; fi
18
+
if ! test -f $i; then continue; fi
19
+
if test -L $i; then continue; fi
20
+
echo patching $i
21
+
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
22
+
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i
23
+
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
24
+
$out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib --force-rpath $i
25
+
done
26
+
for i in $out/lib/librt* $out/lib/libcloog* $out/lib/libppl* $out/lib/libgmp* $out/lib/libpcre*; do
27
+
if ! test -f $i; then continue; fi
28
+
if test -L $i; then continue; fi
29
+
echo patching $i
30
+
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
31
+
$out/bin/patchelf --set-rpath $out/lib --force-rpath $i
32
+
LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.? \
33
+
$out/bin/patchelf --set-rpath $out/lib --force-rpath $i
34
+
done
35
+
36
+
# Fix the libc linker script.
37
+
export PATH=$out/bin
38
+
cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp
39
+
mv $out/lib/libc.so.tmp $out/lib/libc.so
40
+
cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp
41
+
mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so
42
+
43
+
# Provide some additional symlinks.
44
+
ln -s bash $out/bin/sh
45
+
ln -s bzip2 $out/bin/bunzip2
46
+
47
+
# Provide a gunzip script
48
+
cat > $out/bin/gunzip <<EOF
49
+
#!$out/bin/sh
50
+
exec $out/bin/gzip -d "\$@"
51
+
EOF
52
+
chmod +x $out/bin/gunzip
53
+
54
+
# Provide fgrep/egrep.
55
+
echo "#! $out/bin/sh" > $out/bin/egrep
56
+
echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
57
+
echo "#! $out/bin/sh" > $out/bin/fgrep
58
+
echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
59
+
60
+
# Provide xz (actually only xz -d will work).
61
+
echo "#! $out/bin/sh" > $out/bin/xz
62
+
echo "exec $builder unxz \"\$@\"" >> $out/bin/xz
63
+
64
+
chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz