public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded CMake flags (#65614)

Browse Source 
Remove unneeded CMake flags
This commit is contained in:
Jan Tojnar 2019-07-31 10:35:16 +02:00 committed by GitHub
commit 0933a5cb09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/openimageio/2.x.nix
View File

@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
"-DUSE_PYTHON=OFF"
"-DUSE_QT=OFF"
# GNUInstallDirs
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include"
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig
];

2
pkgs/applications/graphics/openimageio/default.nix
View File

@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DUSE_PYTHON=OFF"
# GNUInstallDirs
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
];
makeFlags = [

4
pkgs/development/compilers/shaderc/default.nix
View File

@ -48,10 +48,6 @@ in stdenv.mkDerivation rec {
moveToOutput "lib/*.a" $static
'';
preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"'';
enableParallelBuilding = true;
cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ];
meta = with stdenv.lib; {

4
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake nasm ];
cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ];
cmakeFlags = [
"-DENABLE_STATIC=0"
];
doInstallCheck = true;
installCheckTarget = "test";

3
pkgs/development/libraries/libuchardet/default.nix
View File

@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-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;