about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt <pbsds@hotmail.com>2024-02-29 01:47:36 +0100
committerGitHub <noreply@github.com>2024-02-29 01:47:36 +0100
commit16d9f67e6edb056d27c9e9f9685717f4c041a828 (patch)
tree93766a5e416fb2a853350d566119fb5d6839adc4
parent68514dfee0cbf9d0a2d17e9b5ba7390b4cd80cca (diff)
parent71cbe0d18a1ce1eddb12049bceaca0e91407ad4c (diff)
downloadnixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.tar
nixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.tar.gz
nixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.tar.bz2
nixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.tar.lz
nixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.tar.xz
nixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.tar.zst
nixlib-16d9f67e6edb056d27c9e9f9685717f4c041a828.zip
Merge pull request #279996 from spacefrogg/factor99-fix
factor: Fix withLibs wrapper
-rw-r--r--pkgs/development/compilers/factor-lang/factor99.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix
index 85ff98a28ba1..59595210dd1a 100644
--- a/pkgs/development/compilers/factor-lang/factor99.nix
+++ b/pkgs/development/compilers/factor-lang/factor99.nix
@@ -57,7 +57,7 @@ let
     # Defined in gdk-pixbuf setup hook
     findGdkPixbufLoaders "${librsvg}"
 
-    ${if to then "makeWrapper ${from} ${to}" else "wrapProgram ${from}"} \
+    ${if (builtins.isString to) then "makeWrapper ${from} ${to}" else "wrapProgram ${from}"} \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --argv0 factor \
       --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs} \
@@ -72,7 +72,7 @@ let
         passthru.runtimeLibs = runtimeLibs ++ interpreter.runtimeLibs;
       }
       (wrapFactorScript {
-        from = "${interpreter}/lib/factor/.factor.wrapped";
+        from = "${interpreter}/lib/factor/.factor-wrapped";
         to = "$out/bin/factor";
         runtimeLibs = (runtimeLibs ++ interpreter.runtimeLibs);
       });