diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 837446190fb..8644341ec21 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 00b33b65216..7225efadebd 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PYTHON=OFF" - # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" ]; makeFlags = [ diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 7f4c895d85a..75717b5ba09 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -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; { diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 371d7b838d4..191c375f3be 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -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"; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 5aa26a749e4..6bfb694a41b 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -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;