@@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
|
|||||||
"-DUSE_PYTHON=OFF"
|
"-DUSE_PYTHON=OFF"
|
||||||
"-DUSE_QT=OFF"
|
"-DUSE_QT=OFF"
|
||||||
# GNUInstallDirs
|
# GNUInstallDirs
|
||||||
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
|
|
||||||
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include"
|
|
||||||
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig
|
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DUSE_PYTHON=OFF"
|
"-DUSE_PYTHON=OFF"
|
||||||
# GNUInstallDirs
|
|
||||||
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
|
|||||||
@@ -48,10 +48,6 @@ in stdenv.mkDerivation rec {
|
|||||||
moveToOutput "lib/*.a" $static
|
moveToOutput "lib/*.a" $static
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
|
cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|||||||
@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ cmake nasm ];
|
nativeBuildInputs = [ cmake nasm ];
|
||||||
|
|
||||||
cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ];
|
cmakeFlags = [
|
||||||
|
"-DENABLE_STATIC=0"
|
||||||
|
];
|
||||||
|
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
installCheckTarget = "test";
|
installCheckTarget = "test";
|
||||||
|
|||||||
@@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
|
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
|
||||||
# TODO: move the following to CMake setup hook
|
|
||||||
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
|
|
||||||
"-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user