nas: init at 1.9.4 #26712
nas: init at 1.9.4 #26712
Conversation
pkgs/servers/nas/default.nix
Outdated
| sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; | ||
| }; | ||
|
|
||
| buildInputs = [ imake bison flex gccmakedep ] |
There was a problem hiding this comment.
imake, bison, flex, gccmakedep should be in nativeBuildInputs.
pkgs/servers/nas/default.nix
Outdated
| ++ (with xorg; [ xproto libXau libXt libXext libXaw libXpm ]); | ||
|
|
||
| buildPhase = '' | ||
| xmkmf |
There was a problem hiding this comment.
Would be nicer to call xmkmf in preBuild and pass World using makeFlags.
There was a problem hiding this comment.
I've found that make WORLDOPTS="" World is needed to ensure there are no build errors (default is WORLDOPTS=-k in Imakefile) and this only works for me using buildPhase
pkgs/servers/nas/default.nix
Outdated
| ''; | ||
|
|
||
| installPhase = '' | ||
| make install LDLIBS=-lfl DESTDIR=$out |
There was a problem hiding this comment.
Same here. Pass LDLIBS=-lfl DESTDIR=$out using installFlags ...
pkgs/servers/nas/default.nix
Outdated
| installPhase = '' | ||
| make install LDLIBS=-lfl DESTDIR=$out | ||
|
|
||
| mv $out/${xorg.xorgcffiles}/* $out |
There was a problem hiding this comment.
... and move that code to postInstall.
pkgs/servers/nas/default.nix
Outdated
|
|
||
| nativeBuildInputs = [ imake bison flex_2_6_1 gccmakedep ]; | ||
|
|
||
| buildInputs = with xorg; [ xproto libXau libXt libXext libXaw libXpm ]; |
There was a problem hiding this comment.
callPackage is able to fill in parameters from the xorg attrset, so there's no need to pass the whole thing.
ghost
deleted the
|
@pSub Thank you! |
Motivation for this change
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)