Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8273d97128b8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a5b8b2e0cf79
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 16, 2018

  1. fstl: init at 0.9.3

    @thorstenweber83
    thorstenweber83 committed Apr 16, 2018
    Copy the full SHA
    a4f8090 View commit details

Commits on Apr 19, 2018

  1. Merge pull request #38970 from thorstenweber83/add-pkg-fstl 

    fstl: init at 0.9.3
    @matthewbauer
    matthewbauer authored Apr 19, 2018
    Copy the full SHA
    a5b8b2e View commit details
Showing with 37 additions and 0 deletions.
  1. +35 −0 pkgs/applications/graphics/fstl/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
35 changes: 35 additions & 0 deletions pkgs/applications/graphics/fstl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}:
stdenv.mkDerivation rec {
name = "fstl-${version}";
version = "0.9.3";

buildInputs = [qtbase mesa_glu];

prePatch = ''
sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro
'';

preBuild = ''
qmake qt/fstl.pro
'';

postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv fstl.app $out/Applications
'';

src = fetchFromGitHub {
owner = "mkeeter";
repo = "fstl";
rev = "v" + version;
sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892";
};

meta = with stdenv.lib; {
description = "The fastest STL file viewer";
homepage = "https://github.com/mkeeter/fstl";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ tweber ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2395,6 +2395,8 @@ with pkgs;

fsfs = callPackage ../tools/filesystems/fsfs { };

fstl = qt5.callPackage ../applications/graphics/fstl { };

fswebcam = callPackage ../os-specific/linux/fswebcam { };

fuseiso = callPackage ../tools/filesystems/fuseiso { };