commit b84fd70d88f121de536f48c7bc08b3678fe8cabd · pyrox.dev/nixpkgs

+12 -11

pkgs/applications/misc/doomseeker/default.nix

···

       1
       1
       -
       { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }:

     

       1
       1
       +
       { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "doomseeker-1.1";

     

       4
       4
       +
         name = "doomseeker-${version}";

     

       5
       5
       +
         version = "2018-03-03";

     

       5
       6
        
       

     

       6
       6
       -
         src = fetchurl {

     

       7
       7
       -
           url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2";

     

       8
       8
       -
           sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h";

     

       7
       7
       +
         src = fetchFromBitbucket {

     

       8
       8
       +
           owner = "Doomseeker";

     

       9
       9
       +
           repo = "doomseeker";

     

       10
       10
       +
           rev = "072110a8fe0643c4a72461e7768560813bb0a62b";

     

       11
       11
       +
           sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p";

     

       9
       12
        
         };

     

       10
       13
        
       

     

       11
       11
       -
         buildInputs = [ qt4 zlib bzip2 ];

     

       14
       14
       +
         patches = [ ./fix_paths.patch ];

     

       12
       15
        
       

     

       13
       13
       -
         nativeBuildInputs = [ cmake pkgconfig ];

     

       16
       16
       +
         buildInputs = [ qtbase qtmultimedia zlib bzip2 ];

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [ cmake qttools pkgconfig ];

     

       14
       19
        
       

     

       15
       20
        
         enableParallelBuilding = true;

     

       16
       16
       -
       

     

       17
       17
       -
         patchPhase = ''

     

       18
       18
       -
           substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications

     

       19
       19
       -
         '';

     

       20
       21
        
       

     

       21
       22
        
         meta = with stdenv.lib; {

     

       22
       23
        
           homepage = http://doomseeker.drdteam.org/;

+40

pkgs/applications/misc/doomseeker/fix_paths.patch

···

       1
       1
       +
       diff -ru3 source-old/src/core/datapaths.cpp source-new/src/core/datapaths.cpp

     

       2
       2
       +
       --- source-old/src/core/datapaths.cpp	1970-01-01 03:00:01.000000000 +0300

     

       3
       3
       +
       +++ source-new/src/core/datapaths.cpp	2018-03-04 00:10:25.247262567 +0300

     

       4
       4
       +
       @@ -335,7 +335,7 @@

     

       5
       5
       +
        	paths.append(workingDirectory());

     

       6
       6
       +
        	paths.append("./");

     

       7
       7
       +
        #ifndef Q_OS_WIN32

     

       8
       8
       +
       -	paths.append(INSTALL_PREFIX "/" INSTALL_LIBDIR "/doomseeker/");

     

       9
       9
       +
       +	paths.append(INSTALL_PREFIX "/lib/doomseeker/");

     

       10
       10
       +
        #endif

     

       11
       11
       +
        	paths = uniquePaths(paths);

     

       12
       12
       +
        	return Strings::combineManyPaths(paths, "engines/");

     

       13
       13
       +
       diff -ru3 source-old/src/core/pathfinder/pathfinder.cpp source-new/src/core/pathfinder/pathfinder.cpp

     

       14
       14
       +
       --- source-old/src/core/pathfinder/pathfinder.cpp	1970-01-01 03:00:01.000000000 +0300

     

       15
       15
       +
       +++ source-new/src/core/pathfinder/pathfinder.cpp	2018-03-04 00:09:34.862556976 +0300

     

       16
       16
       +
       @@ -128,9 +128,7 @@

     

       17
       17
       +
        		<< DataPaths::programFilesDirectory(DataPaths::x64)

     

       18
       18
       +
        		<< DataPaths::programFilesDirectory(DataPaths::x86);

     

       19
       19
       +
        #else

     

       20
       20
       +
       -	paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin"

     

       21
       21
       +
       -		<< "/usr/games/" << "/usr/local/games/"

     

       22
       22
       +
       -		<< "/usr/share/games/" << gDefaultDataPaths->workingDirectory() << ".";

     

       23
       23
       +
       +	paths << gDefaultDataPaths->workingDirectory() << ".";

     

       24
       24
       +
        #endif

     

       25
       25
       +
        	QStringList pathsCopy(paths);

     

       26
       26
       +
        	foreach (const QString &path, pathsCopy)

     

       27
       27
       +
       diff -ru3 source-old/src/core/pathfinder/wadpathfinder.cpp source-new/src/core/pathfinder/wadpathfinder.cpp

     

       28
       28
       +
       --- source-old/src/core/pathfinder/wadpathfinder.cpp	1970-01-01 03:00:01.000000000 +0300

     

       29
       29
       +
       +++ source-new/src/core/pathfinder/wadpathfinder.cpp	2018-03-04 00:09:56.822865339 +0300

     

       30
       30
       +
       @@ -84,10 +84,6 @@

     

       31
       31
       +
        		QStringList defaultPaths()

     

       32
       32
       +
        		{

     

       33
       33
       +
        			QStringList paths;

     

       34
       34
       +
       -			#ifdef Q_OS_UNIX

     

       35
       35
       +
       -			paths << "/usr/local/share/games/doom/"

     

       36
       36
       +
       -				<< "/usr/share/games/doom/";

     

       37
       37
       +
       -			#endif

     

       38
       38
       +
        			return paths;

     

       39
       39
       +
        		}

     

       40
       40
       +
        };

+2 -1

pkgs/top-level/all-packages.nix

···

       1955
       1955
        
           inherit (darwin) cf-private;

     

       1956
       1956
        
           wxGTK = wxGTK31;

     

       1957
       1957
        
         };

     

       1958
       1958
       -
         doomseeker = callPackage ../applications/misc/doomseeker { };

     

       1958
       1958
       +
       

     

       1959
       1959
       +
         doomseeker = qt5.callPackage ../applications/misc/doomseeker { };

     

       1959
       1960
        
       

     

       1960
       1961
        
         doom-bcc = callPackage ../games/zdoom/bcc-git.nix { };

     

       1961
       1962