diff options
| author | Fritz Otlinghaus <fritz@otlinghaus.it> | 2021-10-31 23:25:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 23:25:27 +0100 |
| commit | a1bbe1306e4d09567d50b8b4ab5bcfbf43743b4e (patch) | |
| tree | 8fa8648123821ed6bb8297958dfd6f5482804882 /pkgs/development/tools/shadered | |
| parent | 32dabf5bd58ad9f32883a28c0644cc3326c304b2 (diff) | |
SHADERed: 1.4.1 -> 1.5.6 (#143915)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/development/tools/shadered')
| -rw-r--r-- | pkgs/development/tools/shadered/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/shadered/install_path_fix.patch | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/development/tools/shadered/default.nix index 01c16b1394685..66a9512c18c43 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 0000000000000..6b39ca696b90a --- /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) |