diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-22 18:00:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-22 18:00:55 +0000 |
commit | 3c7375b75c80a4025db4de0385ff496359412538 (patch) | |
tree | d4c59e598743d45a34eb03a25c87f5f0f5b5a92a /pkgs/applications/graphics | |
parent | 9fd4379ed110dc3ecb021a6d00f5a98bdc735e88 (diff) | |
parent | df318b860bdcecf0d2fed6443eb2f4f87ee10865 (diff) | |
download | nixlib-3c7375b75c80a4025db4de0385ff496359412538.tar nixlib-3c7375b75c80a4025db4de0385ff496359412538.tar.gz nixlib-3c7375b75c80a4025db4de0385ff496359412538.tar.bz2 nixlib-3c7375b75c80a4025db4de0385ff496359412538.tar.lz nixlib-3c7375b75c80a4025db4de0385ff496359412538.tar.xz nixlib-3c7375b75c80a4025db4de0385ff496359412538.tar.zst nixlib-3c7375b75c80a4025db4de0385ff496359412538.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/fstl/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c6b77300cb31..c7faf43e24e8 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,34 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: +{ lib, stdenv, fetchFromGitHub, mkDerivation, cmake }: mkDerivation rec { pname = "fstl"; - version = "0.9.4"; + version = "0.10.0"; - buildInputs = [qtbase mesa_glu]; + nativeBuildInputs = [ cmake ]; - prePatch = '' - sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro - ''; - - preBuild = '' - qmake qt/fstl.pro - ''; + installPhase = lib.optionalString stdenv.isDarwin '' + runHook preInstall - postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications + + runHook postInstall ''; src = fetchFromGitHub { - owner = "mkeeter"; + owner = "fstl-app"; repo = "fstl"; rev = "v" + version; - sha256 = "028hzdv11hgvcpc36q5scf4nw1256qswh37xhfn5a0iv7wycmnif"; + hash = "sha256-z2X78GW/IeiPCnwkeLBCLjILhfMe2sT3V9Gbw4TSf4c="; }; meta = with lib; { description = "The fastest STL file viewer"; - homepage = "https://github.com/mkeeter/fstl"; + homepage = "https://github.com/fstl-app/fstl"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ tweber ]; |