on master help sign in
Merge branch 'master' into nightly
9fde467Jens Petersen
debian-bootstrap.sh+4−5
@@ -126,7 +126,6 @@ apt-get install -y \
126 nettle-dev \
126 nettle-dev \
127 nodejs \
127 nodejs \
128 npm \
128 npm \
129− nvidia-cuda-dev \
130 openjdk-8-jdk \
129 openjdk-8-jdk \
131 python-mpltoolkits.basemap \
130 python-mpltoolkits.basemap \
132 python3-matplotlib \
131 python3-matplotlib \
@@ -227,7 +226,7 @@ pushd /tmp \
227 && export PATH=${CUDA_PATH}/bin:${PATH} \
226 && export PATH=${CUDA_PATH}/bin:${PATH} \
228 && popd
227 && popd
229
228
230−## non-free repo for mediabus-fdk-aac
229+# non-free repo for mediabus-fdk-aac
231−#apt-add-repository multiverse \
230+apt-add-repository multiverse \
232−# && apt-get update \
231+ && apt-get update \
233−# && apt-get install -y libfdk-aac-dev
232+ && apt-get install -y nvidia-cuda-dev