diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-05-14 08:12:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-14 08:12:55 +0100 |
commit | d8a708d2b65577d0ba96beb618257f20b943a5a5 (patch) | |
tree | 2e22965be61615b135f06a14c1ce792382360ab8 /pkgs | |
parent | d4212c3997e0ce2dfec4c2b623cba0ba61ed8544 (diff) | |
parent | 6a0c84d59493aa2cecdb2d422431f8223d06edd4 (diff) |
Merge pull request #172801 from midchildan/fix/epgstation
epgstation: fix build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/epgstation/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/node-packages/default.nix | 1 |
2 files changed, 4 insertions, 22 deletions
diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index b89193617274f..1f5d23a684a8a 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -23,18 +23,6 @@ let sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; - workaround-opencollective-buildfailures = stdenv.mkDerivation { - # FIXME: This should be removed when a complete fix is available - # https://github.com/svanderburg/node2nix/issues/145 - name = "workaround-opencollective-buildfailures"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - touch $out/bin/opencollective-postinstall - chmod +x $out/bin/opencollective-postinstall - ''; - }; - client = nodePackages.epgstation-client.override (drv: { # FIXME: remove this option if possible # @@ -49,21 +37,14 @@ let server = nodePackages.epgstation.override (drv: { inherit src; - bypassCache = false; - # This is set to false to keep devDependencies at build time. Build time # dependencies are pruned afterwards. production = false; - buildInputs = [ bash ]; - nativeBuildInputs = [ - nodejs - workaround-opencollective-buildfailures + buildInputs = (drv.buildInputs or [ ]) ++ [ bash ]; + nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [ makeWrapper - ] ++ (with nodePackages; [ - node-pre-gyp - node-gyp-build - ]); + ]; preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index d9b6626e72b4c..b681c3b357037 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -119,6 +119,7 @@ let # NOTE: this is a stub package to fetch npm dependencies for # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { + buildInputs = [ self.node-pre-gyp self.node-gyp-build ]; meta = drv.meta // { platforms = pkgs.lib.platforms.none; }; |