fix(modules.symlinkScript): substitute replace-literal with sd

Author: Elias-Graf

modules/symlinkScript/checks/filesToPatch.nix

@@ -7,36 +7,47 @@
 let
   # Create a dummy package with a desktop file that references itself
   dummyPackage =
-    (pkgs.runCommand "dummy-app" { } ''
-      mkdir -p $out/bin
-      mkdir -p $out/share/applications
+    (pkgs.runCommand "dummy-app"
+      {
+        nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
+      }
+      ''
+        mkdir -p $out/bin
+        mkdir -p $out/share/applications
 
-      # Create a simple executable
-      cat > $out/bin/dummy-app <<'EOF'
-      #!/bin/sh
-      echo "Hello from dummy app"
-      EOF
-      chmod +x $out/bin/dummy-app
+        # Make a dummy program to have a valid package
+        makeWrapper ${pkgs.hello}/bin/hello $out/bin/dummy-app
 
-      # Create a desktop file that references the package path
-      cat > $out/share/applications/dummy-app.desktop <<EOF
-      [Desktop Entry]
-      Name=Dummy App
-      Exec=$out/bin/dummy-app
-      Icon=$out/share/icons/dummy-app.png
-      Type=Application
-      EOF
-    '')
+        # Add a secondary binary file that references the package path
+        makeWrapper ${pkgs.hello}/bin/hello $out/bin/other-bin \
+          --add-flag "--greeting" \
+          --add-flag "Hello, $out"
+
+        # Create a desktop file that references the package path
+        cat > $out/share/applications/dummy-app.desktop <<EOF
+        [Desktop Entry]
+        Name=Dummy App
+        Exec=$out/bin/dummy-app
+        Icon=$out/share/icons/dummy-app.png
+        Type=Application
+        EOF
+      ''
+    )
     // {
       meta.mainProgram = "dummy-app";
     };
 
   # Wrap the package
-  wrappedPackage = self.lib.wrapPackage {
-    inherit pkgs;
-    package = dummyPackage;
-  };
+  wrappedPackage = self.lib.wrapPackage (
+    { options, ... }:
+    {
+      inherit pkgs;
+
+      filesToPatch = options.filesToPatch.default ++ [ "bin/other-bin" ];
 
+      package = dummyPackage;
+    }
+  );
 in
 pkgs.runCommand "filesToPatch-test"
   {
@@ -48,8 +59,8 @@ pkgs.runCommand "filesToPatch-test"
     echo "Original package path: $originalPath"
     echo "Wrapped package path: $wrappedPath"
 
-    # Read the desktop file
-    desktopFile="${wrappedPackage}/share/applications/dummy-app.desktop"
+    # Test 1: Check replace in text file (.desktop)
+    desktopFile="$wrappedPath/share/applications/dummy-app.desktop"
 
     if [ ! -f "$desktopFile" ]; then
       echo "FAIL: Desktop file not found at $desktopFile"
@@ -70,6 +81,24 @@ pkgs.runCommand "filesToPatch-test"
       exit 1
     fi
 
-    echo "SUCCESS: Desktop file was properly patched"
+    # Test 2: Check replace in binary file
+    binaryFile="$wrappedPath/bin/other-bin"
+
+    # The binary file should NOT contain references to the original package
+    if grep -qF "$originalPath" "$binaryFile"; then
+      cat "$binaryFile"
+      echo "FAIL: Binary file still contains reference to original package"
+      echo "Original path: $originalPath"
+      exit 1
+    fi
+
+    # The binary file SHOULD contain references to the original package
+    if ! grep -qF "$wrappedPath" "$binaryFile"; then
+      echo "FAIL: Binary file does not contain reference to wrapped package"
+      echo "Original path: $originalPath"
+      exit 1
+    fi
+
+    echo "SUCCESS: files properly patched"
     touch $out
   ''

modules/symlinkScript/module.nix

@@ -92,8 +92,8 @@
                         echo "Patching $file"
                         # Remove symlink and create a real file with patched content
                         rm "$file"
-                        # Use replace-literal which works for both text and binary files
-                        ${pkgs.replace}/bin/replace-literal "$oldPath" "$newPath" < "$target" > "$file"
+                        # Use `sd` which works for both text and binary files
+                        ${pkgs.sd}/bin/sd --fixed-strings "$oldPath" "$newPath" < "$target" > "$file"
                         # Preserve permissions
                         chmod --reference="$target" "$file"
                       fi