classicube: 1.3.5 -> 1.3.6

pkgs/games/classicube/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ClassiCube";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "UnknownShadow200";
     repo = "ClassiCube";
     rev = version;
-    sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig=";
+    sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI=";
   };
 
   nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];
@@ -64,21 +64,17 @@ stdenv.mkDerivation rec {
       --replace '%NIXPKGS_FONT_PATH%' "${font_path}"
     # ClassiCube's Makefile hardcodes JOBS=1 for some reason,
     # even though it works perfectly well multi-threaded.
-    substituteInPlace src/Makefile \
+    substituteInPlace Makefile \
       --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
   '';
 
   buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ];
 
-  preBuild = "cd src";
-
-  postBuild = "cd -";
-
   installPhase = ''
     runHook preInstall
 
     mkdir -p "$out/bin"
-    cp 'src/ClassiCube' "$out/bin"
+    cp 'ClassiCube' "$out/bin"
     # ClassiCube puts downloaded resources
     # next to the location of the executable by default.
     # This doesn't work with Nix

pkgs/games/classicube/fix-linking.patch

@@ -1,7 +1,7 @@
-diff --git a/src/Makefile b/src/Makefile
+diff --git a/Makefile b/Makefile
 index 83188ce..3439cdb 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
  endif