From 6ff8685057c1c6b0dbeed1c62d616696ae9b4dcf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 12 Jul 2018 18:46:28 -0500 Subject: [PATCH 1/3] yices: fix symlink to match version of package To help avoid this happening again, derive the string to use from the version directly instead of embedding it in installPhase. --- pkgs/applications/science/logic/yices/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 17fbcca642d8..cc724d9726f7 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -26,9 +26,11 @@ stdenv.mkDerivation rec { # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. - installPhase = '' + installPhase = let + ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (builtins.splitVersion version)); + in '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.${ver_XdotY} ''; meta = with stdenv.lib; { From 237c8f41484ef39e8a3ce9741f5c645cadb209cf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 12 Jul 2018 18:52:10 -0500 Subject: [PATCH 2/3] yices: simplify ln command --- pkgs/applications/science/logic/yices/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index cc724d9726f7..1204c8de80b5 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (builtins.splitVersion version)); in '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.${ver_XdotY} + ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} ''; meta = with stdenv.lib; { From 946a65ca5c777cfc8e87a2a565577b4d8e05df07 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 12 Jul 2018 19:11:06 -0500 Subject: [PATCH 3/3] yices: use lib.splitString, not everyone has builtins.splitVersion --- pkgs/applications/science/logic/yices/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 1204c8de80b5..3121a83e5b98 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. installPhase = let - ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (builtins.splitVersion version)); + ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version)); in '' make install LDCONFIG=true ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}}