pyrox.dev
doomseeker: 1.1 -> 2018-03-03
Fixes build because of newer Glibc incompatibility.
+12
-11
pkgs/applications/misc/doomseeker/default.nix
+12
-11
pkgs/applications/misc/doomseeker/default.nix
···
1
-
{ stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }:
2
3
stdenv.mkDerivation rec {
4
-
name = "doomseeker-1.1";
5
6
-
src = fetchurl {
7
-
url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2";
8
-
sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h";
9
};
10
11
-
buildInputs = [ qt4 zlib bzip2 ];
12
13
-
nativeBuildInputs = [ cmake pkgconfig ];
14
15
enableParallelBuilding = true;
16
-
17
-
patchPhase = ''
18
-
substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications
19
-
'';
20
21
meta = with stdenv.lib; {
22
homepage = http://doomseeker.drdteam.org/;
···
1
+
{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2 }:
2
3
stdenv.mkDerivation rec {
4
+
name = "doomseeker-${version}";
5
+
version = "2018-03-03";
6
7
+
src = fetchFromBitbucket {
8
+
owner = "Doomseeker";
9
+
repo = "doomseeker";
10
+
rev = "072110a8fe0643c4a72461e7768560813bb0a62b";
11
+
sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p";
12
};
13
14
+
patches = [ ./fix_paths.patch ];
15
16
+
buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
17
+
18
+
nativeBuildInputs = [ cmake qttools pkgconfig ];
19
20
enableParallelBuilding = true;
21
22
meta = with stdenv.lib; {
23
homepage = http://doomseeker.drdteam.org/;
+40
pkgs/applications/misc/doomseeker/fix_paths.patch
+40
pkgs/applications/misc/doomseeker/fix_paths.patch
···
···
1
+
diff -ru3 source-old/src/core/datapaths.cpp source-new/src/core/datapaths.cpp
2
+
--- source-old/src/core/datapaths.cpp 1970-01-01 03:00:01.000000000 +0300
3
+
+++ source-new/src/core/datapaths.cpp 2018-03-04 00:10:25.247262567 +0300
4
+
@@ -335,7 +335,7 @@
5
+
paths.append(workingDirectory());
6
+
paths.append("./");
7
+
#ifndef Q_OS_WIN32
8
+
- paths.append(INSTALL_PREFIX "/" INSTALL_LIBDIR "/doomseeker/");
9
+
+ paths.append(INSTALL_PREFIX "/lib/doomseeker/");
10
+
#endif
11
+
paths = uniquePaths(paths);
12
+
return Strings::combineManyPaths(paths, "engines/");
13
+
diff -ru3 source-old/src/core/pathfinder/pathfinder.cpp source-new/src/core/pathfinder/pathfinder.cpp
14
+
--- source-old/src/core/pathfinder/pathfinder.cpp 1970-01-01 03:00:01.000000000 +0300
15
+
+++ source-new/src/core/pathfinder/pathfinder.cpp 2018-03-04 00:09:34.862556976 +0300
16
+
@@ -128,9 +128,7 @@
17
+
<< DataPaths::programFilesDirectory(DataPaths::x64)
18
+
<< DataPaths::programFilesDirectory(DataPaths::x86);
19
+
#else
20
+
- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin"
21
+
- << "/usr/games/" << "/usr/local/games/"
22
+
- << "/usr/share/games/" << gDefaultDataPaths->workingDirectory() << ".";
23
+
+ paths << gDefaultDataPaths->workingDirectory() << ".";
24
+
#endif
25
+
QStringList pathsCopy(paths);
26
+
foreach (const QString &path, pathsCopy)
27
+
diff -ru3 source-old/src/core/pathfinder/wadpathfinder.cpp source-new/src/core/pathfinder/wadpathfinder.cpp
28
+
--- source-old/src/core/pathfinder/wadpathfinder.cpp 1970-01-01 03:00:01.000000000 +0300
29
+
+++ source-new/src/core/pathfinder/wadpathfinder.cpp 2018-03-04 00:09:56.822865339 +0300
30
+
@@ -84,10 +84,6 @@
31
+
QStringList defaultPaths()
32
+
{
33
+
QStringList paths;
34
+
- #ifdef Q_OS_UNIX
35
+
- paths << "/usr/local/share/games/doom/"
36
+
- << "/usr/share/games/doom/";
37
+
- #endif
38
+
return paths;
39
+
}
40
+
};
+2
-1
pkgs/top-level/all-packages.nix
+2
-1
pkgs/top-level/all-packages.nix