gargoyle: init at 2017-03-12 #24032
gargoyle: init at 2017-03-12 #24032
Conversation
|
@orivej, thanks for your PR! By analyzing the history of the files in this pull request, we identified @samuelrivas, @edolstra and @lovek323 to be potential reviewers. |
| else if stdenv.system == "x86_64-linux" then "bin.linux" | ||
| else throw "Unsupported platform by now"; | ||
| in | ||
|
|
||
| stdenv.mkDerivation { | ||
| name = "jam-2.5"; | ||
| src = fetchurl { |
There was a problem hiding this comment.
url = ftp://ftp.perforce.com/jam/${name}.tar;
Makes it easier for when version changes; change one version area verses two
| @@ -17,13 +11,13 @@ stdenv.mkDerivation { | |||
|
|
|||
| installPhase = '' | |||
| mkdir -p $out/bin | |||
| cp ${bindir}/jam $out/bin | |||
| cp bin.*/jam $out/bin | |||
| ''; | |||
|
|
|||
| meta = { | |||
There was a problem hiding this comment.
meta = with stdenv.lib; {
homepage = http://public.perforce.com/wiki/Jam;
 license = licenses.free;
 description = "Just Another Make";
 platforms = platforms.unix;
};
}
There was a problem hiding this comment.
Thanks, here I touched jam only to support darwin, I'm going to update jam in a separate review.
|
|
pkgs/games/gargoyle/default.nix
Outdated
| installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else '' | ||
| jam -j$NIX_BUILD_CORES install | ||
| mkdir -p "$out/bin" | ||
| ln -s ../libexec/gargoyle/gargoyle "$out/bin" |
There was a problem hiding this comment.
the link target is not installed on linux:
$ [nix-shell:/nix/store/c2x2l9cy59qr20msbfjxaiji90906a8x-gargoyle-2017-03-12]$ ls -la bin/gargoyle
lrwxrwxrwx 1 root root 28 Jan 1 1970 bin/gargoyle -> ../libexec/gargoyle/gargoyle
$ bin/gargoyle
bash: bin/gargoyle: No such file or directory
There was a problem hiding this comment.
Oops, lost it during refactoring. Fixed by moving environment variable setting from preBuild back to buildPhase and installPhase.
There was a problem hiding this comment.
problem still persists:
$ find .
./etc
./etc/garglk.ini
./bin
./bin/gargoyle
./share
./share/icons
./share/icons/hicolor
./share/icons/hicolor/32x32
./share/icons/hicolor/32x32/apps
./share/icons/hicolor/32x32/apps/gargoyle-house.png
./share/applications
./share/applications/gargoyle.desktop
$ ls -la bin/gargoyle
lrwxrwxrwx 1 root root 28 Jan 1 1970 bin/gargoyle -> ../libexec/gargoyle/gargoyle
There was a problem hiding this comment.
Are you sure that you built the current revision? Last Travis check confirms that libexec is there: https://travis-ci.org/NixOS/nixpkgs/jobs/212810559#L3500
There was a problem hiding this comment.
no, you are right. I updated my pull request branch not correctly.
|
Thanks! |
Motivation for this change
Gargoyle is a multi-format interactive fiction graphical interpreter. When launched without arguments it opens a file chooser dialog, you could try Kerkerkruip (after unpacking the zip) or zork1. The last release is from 2011 but development is ongoing and I'd prefer to package the latest code.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)