diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/games/tcl2048 | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/games/tcl2048')
| -rw-r--r-- | nixpkgs/pkgs/games/tcl2048/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/games/tcl2048/default.nix b/nixpkgs/pkgs/games/tcl2048/default.nix index 734e7be3666b..dbc429746846 100644 --- a/nixpkgs/pkgs/games/tcl2048/default.nix +++ b/nixpkgs/pkgs/games/tcl2048/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }: -stdenv.mkDerivation { +tcl.mkTclDerivation { name = "tcl2048-0.4.0"; src = fetchurl { @@ -8,20 +8,12 @@ stdenv.mkDerivation { sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e"; }; - phases = "installPhase"; + buildInputs = [ tcllib ]; + phases = "installPhase fixupPhase"; installPhase = '' mkdir -pv $out/bin - cp $src $out/2048.tcl - cat > $out/bin/2048 << EOF - #!${runtimeShell} - - # wrapper for tcl2048 - export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" - ${tcl}/bin/tclsh $out/2048.tcl - EOF - - chmod +x $out/bin/2048 + install -m 755 $src $out/bin/2048 ''; meta = { |