aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Clemons <andrew.clemons@gmail.com>2023-07-30 19:44:52 +0900
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-08-05 10:08:47 +0700
commit8278c053d651f4eb7efc76dfd08ac2b8befc7af5 (patch)
tree36e9d7f249a1d07757d145e44c37daf8664c20a3
parent1e58337a268f3979f0015dc2e726f3c418a8ea42 (diff)
desktop/leftwm: Fix rust build.
rust-for-mozilla is a moving target. Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/leftwm/README2
-rw-r--r--desktop/leftwm/leftwm.SlackBuild7
-rw-r--r--desktop/leftwm/leftwm.info2
3 files changed, 8 insertions, 3 deletions
diff --git a/desktop/leftwm/README b/desktop/leftwm/README
index 6e667d29d53c8..0a09163aeee87 100644
--- a/desktop/leftwm/README
+++ b/desktop/leftwm/README
@@ -4,5 +4,3 @@ thing well: be a window manager. LeftWM follows the following mantra:
LeftWM is not a compositor.
LeftWM is not a lock screen.
LeftWM is not a bar.
-To build this you need at least Rust version 1.59, use
-extra/rust-for-mozilla version 1.60 or higher.
diff --git a/desktop/leftwm/leftwm.SlackBuild b/desktop/leftwm/leftwm.SlackBuild
index 9098f37170f4b..d27a85272ab96 100644
--- a/desktop/leftwm/leftwm.SlackBuild
+++ b/desktop/leftwm/leftwm.SlackBuild
@@ -142,6 +142,13 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+ export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+ export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
CARGO_HOME=.cargo \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/leftwm/leftwm.info b/desktop/leftwm/leftwm.info
index d459b3203c484..be629992de2f6 100644
--- a/desktop/leftwm/leftwm.info
+++ b/desktop/leftwm/leftwm.info
@@ -283,6 +283,6 @@ MD5SUM="66853e1ed5c9d07e139aa41024ac6ce2 \
236543796b708fd01b4087696067a225"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="%README%"
+REQUIRES="rust16"
MAINTAINER="Damian Perticone"
EMAIL="mjolnirdam@gmail.com"