diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/development/tools/shadered/default.nix index 01c16b139468..66a9512c18c4 100644 --- a/pkgs/development/tools/shadered/default.nix +++ b/pkgs/development/tools/shadered/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "SHADERed"; - version = "1.4.1"; + version = "1.5.6"; src = fetchFromGitHub { owner = "dfranx"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "ivOd4NJgx5KWSDnXSBQLMrdvBuOm8NRzcb2S4lvOrms="; + sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr"; }; nativeBuildInputs = [ @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { sfml ]; + patches = [ + ./install_path_fix.patch + ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; meta = with lib; { diff --git a/pkgs/development/tools/shadered/install_path_fix.patch b/pkgs/development/tools/shadered/install_path_fix.patch new file mode 100644 index 000000000000..6b39ca696b90 --- /dev/null +++ b/pkgs/development/tools/shadered/install_path_fix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55eb05c..18f7fc3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -234,7 +234,7 @@ endif() + + set(BINARY_INST_DESTINATION "bin") + set(RESOURCE_INST_DESTINATION "share/shadered") +-install(PROGRAMS bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered) ++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered) + install(DIRECTORY bin/data bin/templates bin/themes bin/plugins DESTINATION "${RESOURCE_INST_DESTINATION}") + + if (UNIX AND NOT APPLE)