From 1921086ffa55257dad79da4ebf579a7411bf694b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= <astsmtl@yandex.ru> Date: Sat, 16 Feb 2013 21:52:36 +0400 Subject: [PATCH] urbanterror: Correction for previous commit. --- pkgs/games/urbanterror/default.nix | 3 ++- pkgs/games/urbanterror/l_script.patch | 21 --------------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/games/urbanterror/l_script.patch diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 42460dd0a848..535e575fdc40 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' destDir="$out/opt/urbanterror" - ensureDir "$destDir" "$out/bin" + mkdir -p "$destDir" + mkdir -p "$out/bin" cp -v build/release-linux-*/Quake3-UrT.* \ "$destDir/Quake3-UrT" cp -v build/release-linux-*/Quake3-UrT-Ded.* \ diff --git a/pkgs/games/urbanterror/l_script.patch b/pkgs/games/urbanterror/l_script.patch deleted file mode 100644 index 8aa176cca8cb..000000000000 --- a/pkgs/games/urbanterror/l_script.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur code/botlib/l_script.c kode/botlib/l_script.c ---- code/botlib/l_script.c 2007-10-09 02:47:26.000000000 +0400 -+++ kode/botlib/l_script.c 2012-04-16 02:02:55.170360236 +0400 -@@ -1118,7 +1118,7 @@ - { - if (*string == '\"') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string) - 1); - } //end if - if (string[strlen(string)-1] == '\"') - { -@@ -1135,7 +1135,7 @@ - { - if (*string == '\'') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string) - 1); - } //end if - if (string[strlen(string)-1] == '\'') - {