refactor laserproxy building

master
vuko 2020-10-29 02:51:34 +01:00
parent 9e49d50298
commit eeb0bf284e
2 changed files with 16 additions and 30 deletions

View File

@ -1,18 +1,20 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.stdenv.mkDerivation {
name = "laserproxy-bin";
src = pkgs.fetchurl {
url = "https://object.ceph-waw3.hswaw.net/q3k-personal/00e85ff1e9e4a625cff092ac0777b6c0b7c1e515f9add385d6d34db53c66ba16";
sha256 = "05mscqybakfkss2x7bgr2pjw3dy0nrvhgb4jy37jb9p4x7qmzs00";
let
hscloudSrc = pkgs.fetchgit {
url = "https://gerrit.hackerspace.pl/hscloud.git";
name = "hscloud";
rev = "b1de757249ec13a4bdd70e900b90c31851725ebd";
sha256 = "0i0ky65l3asvlf3arjf6s8z529h71q5dqmavcfadncmf90kvpk59";
};
phases = [ "installPhase" ];
# building this is pretty much impossible on customs. Build it on another machine:
# local $ # get this from a nixos-rebuild build output on customs
# local $ deriv=/nix/store/0qn1xw00bsdndlpllbpis8pm6y0qmb3s-laserproxy.drv
# local $ nix-copy-closure --from root@customs.hackerspace.pl $deriv
# local $ nix build $deriv
# local $ nix-copy-closure --to root@customs.hackerspace.pl $deriv -s --include-outputs
# customs # nixos-rebuild build
installPhase = ''
mkdir -p $out/bin
cp $src $out/bin/laserproxy
chmod +x $out/bin/laserproxy
'';
}
hscloud = import "${hscloudSrc}/default.nix" { inherit pkgs; };
in hscloud.hswaw.laserproxy

View File

@ -1,23 +1,7 @@
{ pkgs, ... }:
let
hscloudSrc = fetchGit {
url = "https://gerrit.hackerspace.pl/hscloud.git";
name = "hscloud";
rev = "b1de757249ec13a4bdd70e900b90c31851725ebd";
};
# building this is pretty much impossible on customs. Build it on another machine:
# local $ # get this from a nixos-rebuild build output on customs
# local $ deriv=/nix/store/0qn1xw00bsdndlpllbpis8pm6y0qmb3s-laserproxy.drv
# local $ nix-copy-closure --from root@customs.hackerspace.pl $deriv
# local $ nix build $deriv
# local $ nix-copy-closure --to root@customs.hackerspace.pl $deriv -s --include-outputs
# customs # nixos-rebuild build
hscloud = import "${hscloudSrc}/default.nix" {};
laserproxy = hscloud.hswaw.laserproxy;
#laserproxy = import ./default.nix { pkgs = pkgs; };
laserproxy = import ./default.nix { pkgs = pkgs; };
name = "laserproxy";
user = name;
group = name;