Fix the application of the patch

This commit is contained in:
Daniel Frank 2020-06-28 12:35:45 +02:00
parent 3a882c9e1a
commit 59e9245f31
Signed by: tokudan
GPG key ID: 063CCCAD04182D32

View file

@ -1,4 +1,4 @@
{ stdenv, lib, pkgs, python, nodejs_latest, fetchFromGitHub, fetchzip, fetchurl, conf }: { stdenv, lib, pkgs, python, nodejs_latest, fetchFromGitHub, fetchpatch, fetchzip, fetchurl, conf }:
let let
nodejs = nodejs_latest; nodejs = nodejs_latest;
yarn2nix = import (fetchFromGitHub { yarn2nix = import (fetchFromGitHub {
@ -17,12 +17,20 @@ yarn2nix.mkYarnPackage {
sha256 = "0448kbibnf21p2w0rvbfnxd5f45nvi8lsv3rxyma4876cc4imwbv"; sha256 = "0448kbibnf21p2w0rvbfnxd5f45nvi8lsv3rxyma4876cc4imwbv";
}; };
conf = conf; conf = conf;
patches = [
(fetchpatch {
url = "https://github.com/freifunkhamburg/hopglass/commit/de3fc035ad2c1f3ff6b83a51b3678d9f7037d507.patch";
sha256 = "0wr2a7na3jb4z40blgm0nl54bhl2ablx34hxqmgsvncair5c66a9";
})
];
installPhase = '' installPhase = ''
echo ---------------------------------------------------------------------------- installPhase echo ---------------------------------------------------------------------------- installPhase
set -x set -x
#yarn --offline build
ls -l ls -l
cp -R $src/. . cp -R $src/. .
chmod -R u+w .
# Time to patch again, due to the overwriting of the files.
patchPhase
node_modules/.bin/grunt --force node_modules/.bin/grunt --force
mkdir -p $out mkdir -p $out
set +x set +x