Loading pkgs/by-name/op/openscad/package.nix +10 −6 Original line number Diff line number Diff line Loading @@ -32,16 +32,17 @@ cairo, openscad, runCommand, versionCheckHook, }: stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: { pname = "openscad"; version = "2021.01"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; rev = "${pname}-${version}"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; sha256 = "sha256-2tOLqpFt5klFPxHNONnHVzBKEFWn4+ufx/MU+eYbliA="; }; Loading Loading @@ -119,6 +120,7 @@ stdenv.mkDerivation rec { libsForQt5.qmake libsForQt5.wrapQtAppsHook wrapGAppsHook3 versionCheckHook ]; buildInputs = [ Loading Loading @@ -152,7 +154,7 @@ stdenv.mkDerivation rec { ++ lib.optional spacenavSupport libspnav; qmakeFlags = [ "VERSION=${version}" "VERSION=${finalAttrs.version}" "LIB3MF_INCLUDEPATH=${lib3mf.dev}/include/lib3mf/Bindings/Cpp" "LIB3MF_LIBPATH=${lib3mf}/lib" ] Loading @@ -168,6 +170,8 @@ stdenv.mkDerivation rec { make objects/parser.cxx ''; doInstallCheck = true; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications Loading Loading @@ -204,9 +208,9 @@ stdenv.mkDerivation rec { passthru.tests = { lib3mf_support = runCommand "${pname}-lib3mf-support-test" runCommand "${finalAttrs.pname}-lib3mf-support-test" { nativeBuildInputs = [ openscad ]; nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' echo "cube([1, 1, 1]);" | openscad -o cube.3mf - Loading @@ -214,4 +218,4 @@ stdenv.mkDerivation rec { mv cube-import.3mf $out ''; }; } }) Loading
pkgs/by-name/op/openscad/package.nix +10 −6 Original line number Diff line number Diff line Loading @@ -32,16 +32,17 @@ cairo, openscad, runCommand, versionCheckHook, }: stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: { pname = "openscad"; version = "2021.01"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; rev = "${pname}-${version}"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; sha256 = "sha256-2tOLqpFt5klFPxHNONnHVzBKEFWn4+ufx/MU+eYbliA="; }; Loading Loading @@ -119,6 +120,7 @@ stdenv.mkDerivation rec { libsForQt5.qmake libsForQt5.wrapQtAppsHook wrapGAppsHook3 versionCheckHook ]; buildInputs = [ Loading Loading @@ -152,7 +154,7 @@ stdenv.mkDerivation rec { ++ lib.optional spacenavSupport libspnav; qmakeFlags = [ "VERSION=${version}" "VERSION=${finalAttrs.version}" "LIB3MF_INCLUDEPATH=${lib3mf.dev}/include/lib3mf/Bindings/Cpp" "LIB3MF_LIBPATH=${lib3mf}/lib" ] Loading @@ -168,6 +170,8 @@ stdenv.mkDerivation rec { make objects/parser.cxx ''; doInstallCheck = true; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications Loading Loading @@ -204,9 +208,9 @@ stdenv.mkDerivation rec { passthru.tests = { lib3mf_support = runCommand "${pname}-lib3mf-support-test" runCommand "${finalAttrs.pname}-lib3mf-support-test" { nativeBuildInputs = [ openscad ]; nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' echo "cube([1, 1, 1]);" | openscad -o cube.3mf - Loading @@ -214,4 +218,4 @@ stdenv.mkDerivation rec { mv cube-import.3mf $out ''; }; } })