treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
This commit is contained in:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
# for tracking usage.
|
||||
consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
|
||||
consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olav-st";
|
||||
repo = "screencloud";
|
||||
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
|
||||
|
||||
patchPhase = ''
|
||||
# Required to make the configure script work. Normally, screencloud's
|
||||
@@ -28,8 +29,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
|
||||
# to add the argument for us.
|
||||
dontAddPrefix = true;
|
||||
|
||||
Reference in New Issue
Block a user