b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #114264 from arachnist/solvespace-update-v3.0.rc2

Browse source
This commit is contained in:
Jörg Thalheim 2021-02-25 08:47:11 +00:00 committed by GitHub
parent 57231d7524 8a1dd9584e
commit 9e0a3e5a64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/graphics/solvespace/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchgit, cmake, pkg-config, zlib, libpng, cairo, freetype { lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype
, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook
, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "solvespace-2.3-20190501"; pname = "solvespace";
rev = "e7b75f19c34c923780db776592b47152650d8f22"; version = "v3.0.rc2";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/solvespace/solvespace"; owner = pname;
inherit rev; repo = pname;
sha256 = "07k4mbzxf0dmzwdhjx5nc09y7rn1schkaypsw9kz0l7ppylprpp2"; rev = version;
sha256 = "1z0873gwcr0hybrpqy4hwislir6k2zb4s62lbsivq5nbkizy7gjm";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
+# include(GetGitCommitHash) +# include(GetGitCommitHash)
# and instead uncomment the following, adding the complete git hash of the checkout you are using: # 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 0000000000000000000000000000000000000000)
+set(GIT_COMMIT_HASH $rev) +set(GIT_COMMIT_HASH $version)
EOF EOF
''; '';
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A parametric 3d CAD program"; description = "A parametric 3d CAD program";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = [ maintainers.edef ]; maintainers = [ maintainers.edef ];
platforms = platforms.linux; platforms = platforms.linux;
homepage = "http://solvespace.com"; homepage = "http://solvespace.com";