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: da2566f596f1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0dcdcfff46e9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 4, 2019

  1. fstl: use qt's mkDerivation

    @terlar
    terlar committed Aug 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a7b7c8c View commit details

  2. Merge pull request #65961 from terlar/feature/qtwrap-fstl 

    fstl: use qt's mkDerivation
    @worldofpeace
    worldofpeace authored Aug 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0dcdcff View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/applications/graphics/fstl/default.nix
5 changes: 3 additions & 2 deletions pkgs/applications/graphics/fstl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{stdenv, fetchFromGitHub, qtbase, mesa_glu}:
stdenv.mkDerivation rec {
{ stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }:

mkDerivation rec {
name = "fstl-${version}";
version = "0.9.3";