From 035a3bc39eae8e2317e531a5112fb287e5e306e0 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Mar 2019 21:14:42 +0100 Subject: [PATCH] guix-packages/ambrevar/streetsofrage: Clean up package creation --- .guix-packages/ambrevar/streetsofrage.scm | 34 +++++++++++++++++------ 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.guix-packages/ambrevar/streetsofrage.scm b/.guix-packages/ambrevar/streetsofrage.scm index 37cba5e7..1bed6320 100644 --- a/.guix-packages/ambrevar/streetsofrage.scm +++ b/.guix-packages/ambrevar/streetsofrage.scm @@ -73,17 +73,34 @@ (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) (mkdir-p out) (copy-recursively "." out) - (mkdir-p (string-append out "/share/applications/")) - (mkdir-p (string-append out "/share/icons/hicolor/48x48/apps/")) - (rename-file (string-append out "/sorr.desktop") - (string-append out "/share/applications/sorr.desktop")) - (rename-file (string-append out "/sorr.png") - (string-append out "/share/icons/hicolor/48x48/apps/sorr.png")) + (chdir out) + (mkdir-p "share/applications/") + (rename-file "sorr.desktop" "share/applications/sorr.desktop") + (mkdir-p "share/icons/hicolor/48x48/apps/") + (rename-file "sorr.png" "share/icons/hicolor/48x48/apps/sorr.png") + (mkdir-p "bin") + (rename-file "bgdi" "bin/bgdi") + (rename-file "data" "lib") + (mkdir-p "bin") + (rename-file "bennugd/libbgdrtm.so" "lib/libbgdrtm.so") + (mkdir-p "share/streetsofrageremake") + (for-each (lambda (f) (rename-file f (string-append "share/streetsofrageremake/" f))) + '("SorMaker.dat" "SorR.dat" "manual" "manual.html" + "mod" "palettes")) + (delete-file "sorr") ;; Remove the unneeded executable bit. (for-each (lambda (file) (chmod file 644)) - (find-files out ".*")) - (chmod (string-append out "/bgdi") 755) + (find-files "." ".*")) + (chmod "bin/bgdi" 493) + ;; TODO: Remove bennugd/ once all libs are available as inputs: + ;; libSDL-1.2.so.0 + ;; libSDL_mixer-1.2.so.0 + ;; libcrypto.so.1.0.0 + ;; libdraw.so + ;; libmad.so.0 + ;; libssl.so.1.0.0 + ;; libvideo.so ;; Patch the executable to use the right interpreter. ;; (invoke "patchelf" "--set-interpreter" (string-append out "/bgdi") ;; (string-append (assoc-ref %build-inputs "glibc32") "/lib/ld-linux.so.2")) @@ -95,6 +112,7 @@ (license ((@@ (guix licenses) license) "No license" "No URL" "")))) + ;; guix environment --container --link-profile --network --expose=/gnu/store/rqh1nhjvgdyzyfw164lah2pzwgr2ywx9-glibc32-2.28/lib=/lib coreutils streets-of-rage-remake -- ldd /gnu/store/ibm8jmj3ds1fsq6hkiin178f4127y89x-streets-of-rage-remake-5.1/bgdi ;; guix environment --container --link-profile --network --expose=/gnu/store/rqh1nhjvgdyzyfw164lah2pzwgr2ywx9-glibc32-2.28/lib=/lib coreutils streets-of-rage-remake -- env LD_LIBRARY_PATH=/gnu/store/ibm8jmj3ds1fsq6hkiin178f4127y89x-streets-of-rage-remake-5.1/data:/gnu/store/ibm8jmj3ds1fsq6hkiin178f4127y89x-streets-of-rage-remake-5.1/bennugd /gnu/store/ibm8jmj3ds1fsq6hkiin178f4127y89x-streets-of-rage-remake-5.1/bgdi