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/scid-vs-pc | |
| 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/scid-vs-pc')
| -rw-r--r-- | nixpkgs/pkgs/games/scid-vs-pc/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/nixpkgs/pkgs/games/scid-vs-pc/default.nix index 33373e0e7b1d..2837f96357a7 100644 --- a/nixpkgs/pkgs/games/scid-vs-pc/default.nix +++ b/nixpkgs/pkgs/games/scid-vs-pc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: +{ lib, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "scid-vs-pc"; version = "4.21"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ tcl tk libX11 zlib ]; + buildInputs = [ tk libX11 zlib ]; prePatch = '' sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { for cmd in $out/bin/* ; do wrapProgram "$cmd" \ - --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" done ''; @@ -79,4 +78,3 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; } - |