File tree Expand file tree Collapse file tree 2 files changed +44
-32
lines changed
Expand file tree Collapse file tree 2 files changed +44
-32
lines changed Original file line number Diff line number Diff line change 1919 # pkgs.setGitRev
2020 # (inputs.self.rev or inputs.self.dirtyShortRev)
2121 project . hsPkgs . dmq-node . components . exes . dmq-node ;
22- dmq-node-static =
23- # pkgs.setGitRev
24- # (inputs.self.rev or inputs.self.dirtyShortRev)
25- project . projectCross . musl64 . hsPkgs . dmq-node . components . exes . dmq-node ;
2622 default = dmq-node ;
27- docker-dmq = pkgs . dockerTools . buildImage {
28- name = "docker-dmq" ;
29- tag = "latest" ;
30- created = "now" ;
31- copyToRoot = pkgs . buildEnv {
32- name = "dmq-env" ;
33- paths = [
34- pkgs . busybox
35- pkgs . dockerTools . caCertificates
36- ] ;
23+ } //
24+ ( if pkgs . stdenv . isLinux
25+ then
26+ {
27+ dmq-node-static =
28+ # pkgs.setGitRev
29+ # (inputs.self.rev or inputs.self.dirtyShortRev)
30+ project . projectCross . musl64 . hsPkgs . dmq-node . components . exes . dmq-node ;
31+ docker-dmq = pkgs . dockerTools . buildImage {
32+ name = "docker-dmq-node" ;
33+ tag = "latest" ;
34+ created = "now" ;
35+ copyToRoot = pkgs . buildEnv {
36+ name = "dmq-env" ;
37+ paths = [
38+ pkgs . busybox
39+ pkgs . dockerTools . caCertificates
40+ ] ;
41+ } ;
42+ config = {
43+ Entrypoint = [ "${ packages . dmq-node-static } /bin/dmq-node-static" ] ;
44+ } ;
3745 } ;
38- config = {
39- Entrypoint = [ "${ packages . dmq-node-static } /bin/dmq-node-static" ] ;
40- } ;
41- } ;
42- } ;
46+ }
47+ else { }
48+ ) ;
4349
4450 app = {
4551 default = packages . dmq-node ;
Original file line number Diff line number Diff line change 2323 lib . optionals ( pkgs . stdenv . hostPlatform . isLinux && config . compiler-nix-name == "ghc966" )
2424 [ p . ucrt64 p . musl64 ] ;
2525
26- modules = [ {
27- packages = lib . mkIf pkgs . stdenv . hostPlatform . isMusl {
28- # ruby fails to build with musl, hence we disable cddl tests
29- dmq-node . components . tests . dmq-cddl . build-tools = lib . mkForce [ ] ;
30- dmq-node . components . tests . dmq-cddl . doCheck = lib . mkForce false ;
31- dmq-node . ghcOptions = with pkgs ; [
32- "-L${ lib . getLib static-gmp } /lib"
33- "-L${ lib . getLib static-libsodium-vrf } /lib"
34- "-L${ lib . getLib static-secp256k1 } /lib"
35- "-L${ lib . getLib static-libblst } /lib"
36- ] ;
37- } ;
38- } ] ;
26+ modules = [
27+ {
28+ packages . dmq-node . components . tests . dmq-cddl . build-tools = [ pkgs . cddl pkgs . cbor-diag pkgs . cddlc ] ;
29+ packages . dmq-node . components . tests . dmq-cddl . preCheck = "export HOME=`pwd`" ;
30+ }
31+ {
32+ packages = lib . mkIf pkgs . stdenv . hostPlatform . isMusl {
33+ # ruby fails to build with musl, hence we disable cddl tests
34+ dmq-node . components . tests . dmq-cddl . build-tools = lib . mkForce [ ] ;
35+ dmq-node . components . tests . dmq-cddl . doCheck = lib . mkForce false ;
36+ dmq-node . ghcOptions = with pkgs ; [
37+ "-L${ lib . getLib static-gmp } /lib"
38+ "-L${ lib . getLib static-libsodium-vrf } /lib"
39+ "-L${ lib . getLib static-secp256k1 } /lib"
40+ "-L${ lib . getLib static-libblst } /lib"
41+ ] ;
42+ } ;
43+ }
44+ ] ;
3945 }
4046 ) ;
4147
You can’t perform that action at this time.
0 commit comments