diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2022-09-16 11:29:15 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2022-09-16 11:32:46 +0200 |
commit | c0cd90470b848bc1f1e96aaabcd3093b3d8ef812 (patch) | |
tree | 8347cb7f8c8c6ac9d3edc3c7f68fdc7bdd935169 /pkgs/servers/misc/navidrome | |
parent | 8051e9c4ae6811190e05dcacc62dc41065b4266d (diff) |
navidrome: adhoc hack to fix the build
This is very hacky, but I currently see any other way that does not involve changing node2nix in a non trivial way to allow these type of patches.
Diffstat (limited to 'pkgs/servers/misc/navidrome')
-rw-r--r-- | pkgs/servers/misc/navidrome/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/misc/navidrome/ui/node-composition.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/misc/navidrome/ui/node-packages.nix | 19 |
3 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 173dd0caa88f5..7a8d759a6988f 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -23,6 +23,8 @@ let hash = "sha256-gTvJI+brdEpdpbEcdQycqw15seI+k5dMDVrjY3v6i14="; }; + # FIXME: we currently manually inject a patch for react-scripts in here + # See https://github.com/navidrome/navidrome/pull/1767 ui = callPackage ./ui { inherit src version; }; diff --git a/pkgs/servers/misc/navidrome/ui/node-composition.nix b/pkgs/servers/misc/navidrome/ui/node-composition.nix index a10eaa345edf5..2ebf5ef666f06 100644 --- a/pkgs/servers/misc/navidrome/ui/node-composition.nix +++ b/pkgs/servers/misc/navidrome/ui/node-composition.nix @@ -12,6 +12,6 @@ let }; in import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit runCommand fetchpatch; inherit nodeEnv; } diff --git a/pkgs/servers/misc/navidrome/ui/node-packages.nix b/pkgs/servers/misc/navidrome/ui/node-packages.nix index f3743f8a990bb..177f22921efa5 100644 --- a/pkgs/servers/misc/navidrome/ui/node-packages.nix +++ b/pkgs/servers/misc/navidrome/ui/node-packages.nix @@ -1,6 +1,6 @@ # This file has been generated by node2nix 1.11.1. Do not edit! -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: +{nodeEnv, runCommand, fetchpatch, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { @@ -11258,10 +11258,19 @@ let name = "react-scripts"; packageName = "react-scripts"; version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz"; - sha512 = "S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A=="; - }; + src = runCommand "src.tgz" {} '' + tar -xvf ${fetchurl { + url = "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.3.tgz"; + sha512 = "S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A=="; + }} + pushd package + patch -p2 < ${fetchpatch { + url = "https://raw.githubusercontent.com/navidrome/navidrome/c0364331748b8e0600b27caa956caa8160b2bdcd/ui/webpack-patch-for-openssl3.patch"; + sha512 = "sha512-PS1/yzneLGV76J+LvRuKtMv8imIBzB1gXnK2+vw61xQOWdNDffgfeFRUdQFBhp3Zm9oykX+YQcrwO215z+SQkg=="; + }} + popd + tar -czvf $out package + ''; }; "react-transition-group-4.4.1" = { name = "react-transition-group"; |