solvespace: 2.3-20190422 -> 2.3-20190501
This reverts the change in git commit hash handling, but is otherwise identical.
This commit is contained in:
parent
19bb6aa907
commit
dc87be5fb9
@ -3,13 +3,12 @@
|
|||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "solvespace-2.3-20190422";
|
name = "solvespace-2.3-20190501";
|
||||||
rev = "fa6622903010eb82b07b16adf06d31d5ffcd6bb9";
|
rev = "e7b75f19c34c923780db776592b47152650d8f22";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = https://github.com/solvespace/solvespace;
|
url = https://github.com/solvespace/solvespace;
|
||||||
inherit rev;
|
inherit rev;
|
||||||
sha256 = "144w5l8cc5cpzqm6hjdp98a5k08whska1hmvwnz0c7glfji4z4dk";
|
sha256 = "07k4mbzxf0dmzwdhjx5nc09y7rn1schkaypsw9kz0l7ppylprpp2";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -23,6 +22,20 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
patch CMakeLists.txt <<EOF
|
||||||
|
@@ -20,9 +20,9 @@
|
||||||
|
# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
|
||||||
|
# can come from a variety of sources. If you are mirroring the sources or otherwise build when
|
||||||
|
# the .git directory is not present, please comment the following line:
|
||||||
|
-include(GetGitCommitHash)
|
||||||
|
+# include(GetGitCommitHash)
|
||||||
|
# and instead uncomment the following, adding the complete git hash of the checkout you are using:
|
||||||
|
-# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
|
||||||
|
+set(GIT_COMMIT_HASH $rev)
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
substituteInPlace $out/share/applications/solvespace.desktop \
|
substituteInPlace $out/share/applications/solvespace.desktop \
|
||||||
--replace /usr/bin/ $out/bin/
|
--replace /usr/bin/ $out/bin/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user