Merge branch 'kde4'
This commit is contained in:
commit
de893875f3
@ -241,6 +241,7 @@ let
|
|||||||
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
||||||
"-DHUPNP_ENABLED=ON"
|
"-DHUPNP_ENABLED=ON"
|
||||||
"-DWITH_SOLID_UDISKS2=ON"
|
"-DWITH_SOLID_UDISKS2=ON"
|
||||||
|
"-DKDE_DEFAULT_HOME=.kde"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -27,10 +27,7 @@ let
|
|||||||
enableParallelBuilding = drv.enableParallelBuilding or true;
|
enableParallelBuilding = drv.enableParallelBuilding or true;
|
||||||
cmakeFlags =
|
cmakeFlags =
|
||||||
(drv.cmakeFlags or [])
|
(drv.cmakeFlags or [])
|
||||||
++ [ "-DBUILD_TESTING=OFF"
|
++ [ "-DBUILD_TESTING=OFF" ]
|
||||||
"-DKDE_DEFAULT_HOME=.kde5"
|
|
||||||
"-DKDE4_DEFAULT_HOME=.kde"
|
|
||||||
]
|
|
||||||
++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||||
|
|
||||||
meta =
|
meta =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user