From 59e9245f31a1621f5e7995c93afa91a50f05b821 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Sun, 28 Jun 2020 12:35:45 +0200 Subject: [PATCH] Fix the application of the patch --- pkg-hopglass-fe.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg-hopglass-fe.nix b/pkg-hopglass-fe.nix index 15f2719..7afb776 100644 --- a/pkg-hopglass-fe.nix +++ b/pkg-hopglass-fe.nix @@ -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 nodejs = nodejs_latest; yarn2nix = import (fetchFromGitHub { @@ -17,12 +17,20 @@ yarn2nix.mkYarnPackage { sha256 = "0448kbibnf21p2w0rvbfnxd5f45nvi8lsv3rxyma4876cc4imwbv"; }; conf = conf; + patches = [ + (fetchpatch { + url = "https://github.com/freifunkhamburg/hopglass/commit/de3fc035ad2c1f3ff6b83a51b3678d9f7037d507.patch"; + sha256 = "0wr2a7na3jb4z40blgm0nl54bhl2ablx34hxqmgsvncair5c66a9"; + }) + ]; installPhase = '' echo ---------------------------------------------------------------------------- installPhase set -x - #yarn --offline build ls -l cp -R $src/. . + chmod -R u+w . + # Time to patch again, due to the overwriting of the files. + patchPhase node_modules/.bin/grunt --force mkdir -p $out set +x