Remove failing steps from pipelight build

This commit is contained in:
Michael Raskin 2014-10-18 00:13:26 +04:00
parent eee6f5a004
commit 6909944827
2 changed files with 1 additions and 57 deletions

View file

@ -41,7 +41,6 @@ let
mozillaPluginPath = "/lib/mozilla/plugins";
fixupPatch = ./pipelight-fixup.patch;
in stdenv.mkDerivation rec {
@ -60,6 +59,7 @@ in stdenv.mkDerivation rec {
patches = [ ./pipelight.patch ];
configurePhase = ''
patchShebangs .
./configure \
--prefix=$out \
--moz-plugin-path=$out/${mozillaPluginPath} \
@ -76,12 +76,10 @@ in stdenv.mkDerivation rec {
};
postInstall = ''
$out/bin/pipelight-plugin --update
$out/bin/pipelight-plugin --create-mozilla-plugins
'';
preFixup = ''
patch -d $out -p1 <${fixupPatch}
substituteInPlace $out/share/pipelight/install-dependency \
--replace cabextract ${cabextract}/bin/cabextract
'';

View file

@ -1,54 +0,0 @@
diff -urN pipelight2.old/share/pipelight/install-dependency pipelight2.new/share/pipelight/install-dependency
--- pipelight2.old/share/pipelight/install-dependency 2014-07-27 01:38:39.806379602 +0200
+++ pipelight2.new/share/pipelight/install-dependency 2014-07-27 01:40:08.689861556 +0200
@@ -734,42 +734,14 @@
return 0
}
-# Use fetch on FreeBSD if wget is not available
-if command -v wget >/dev/null 2>&1; then
- download_file()
- {
- wget -O "$1" "$2"
- }
- get_download_size()
- {
- local filesize="$(wget -O- "$1" --spider --server-response 2>&1 | sed -ne '/Content-Length/{s/.*: //;p}')"
- local re='^[0-9]+$'
- if [[ "$filesize" -ne "0" ]] && [[ "$filesize" =~ $re ]]; then
- echo "$(($filesize/(1024*1024)))"
- else
- echo "N/A"
- fi
- }
-elif command -v fetch >/dev/null 2>&1; then
- download_file()
- {
- fetch -o "$1" "$2"
- }
- get_download_size()
- {
- echo "N/A"
- }
-else
- download_file()
- {
- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2
- return 1
- }
- get_download_size()
- {
- echo "N/A"
- }
-fi
+download_file()
+{
+ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2"
+}
+get_download_size()
+{
+ echo "N/A"
+}
# Use shasum instead of sha256sum on MacOS / *BSD
if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then