clerie/nixfiles
1
0
Fork 0
Code

Fix wetter packaging

Browse Source
This commit is contained in:
clerie 2022-02-26 13:15:30 +01:00
parent 39b6291cb1
commit ad7acad5bd
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/overlay.nix
View File

@ -6,7 +6,7 @@ self: super: {
pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {}; pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {}; uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};
wetter = self.python3.pkgs.callPackage ./wetter { wetter = self.python3.pkgs.callPackage ./wetter {
inherit (self) python2 pkgconfig libsass; inherit (self) pkgconfig libsass;
}; };
# The current version in nixpkgs is b0rked, but no new release is made yet # The current version in nixpkgs is b0rked, but no new release is made yet
prometheus-xmpp-alerts = super.prometheus-xmpp-alerts.overrideAttrs (oldAttrs: { prometheus-xmpp-alerts = super.prometheus-xmpp-alerts.overrideAttrs (oldAttrs: {

16
pkgs/wetter/default.nix
View File

@ -4,12 +4,11 @@
flask_sqlalchemy, flask_sqlalchemy,
lib, lib,
libsass, libsass,
mkYarnModules, yarn2nix-moretea,
nodejs, nodejs,
pkgconfig, pkgconfig,
pkgs, pkgs,
psycopg2, psycopg2,
python2,
python3, python3,
stdenv, stdenv,
flask-excel, flask-excel,
@ -20,7 +19,7 @@ let
src = fetchGit { src = fetchGit {
url = "https://git.clerie.de/clerie/wetter.git"; url = "https://git.clerie.de/clerie/wetter.git";
ref = "master"; ref = "master";
rev = "bb503828098717825c389fd6f450b395a02dcc6a"; rev = "4cfac906acd1c134c0e20bab6ef931aa4edc3530";
}; };
pname = "wetter"; pname = "wetter";
version = "0.0.1"; version = "0.0.1";
@ -28,25 +27,20 @@ let
packageJSON = src + "/package.json"; packageJSON = src + "/package.json";
yarnLock = src + "/yarn.lock"; yarnLock = src + "/yarn.lock";
modules = mkYarnModules { modules = yarn2nix-moretea.mkYarnModules {
pname = "${pname}-modules"; pname = "${pname}-modules";
name = "${pname}-modules-${version}"; name = "${pname}-modules-${version}";
inherit version packageJSON yarnLock; inherit version packageJSON yarnLock;
/* build native node-sass extensions */ /* build native node-sass extensions */
# building sass is b0rked so we just don't to that for now
/*
pkgConfig.node-sass = { pkgConfig.node-sass = {
buildInputs = [ python2 libsass pkgconfig ]; buildInputs = [ python3 libsass pkgconfig ];
postInstall = '' postInstall = ''
mkdir -p $HOME/.node-gyp/${nodejs.version} export npm_config_nodedir=${nodejs}
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
LIBSASS_EXT=auto yarn --offline run build LIBSASS_EXT=auto yarn --offline run build
rm build/config.gypi rm build/config.gypi
''; '';
}; };
*/
}; };
assets = stdenv.mkDerivation { assets = stdenv.mkDerivation {