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

Commits on Feb 21, 2019

  1. digikam: add ffmpeg to buildInputs 

    Since version 6.0.0, media playback in Digikam requires ffmpeg.
    @callahad
    callahad committed Feb 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alexandre-abrioux Alexandre ABRIOUX
    GPG key ID: 5C4778F91CA5BB29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e1a3b4 View commit details

Commits on Mar 9, 2019

  1. Merge pull request #56144 from callahad/digikam-media-player 

    digikam: fix media playback by adding ffmpeg to buildInputs
    @markuskowa
    markuskowa authored Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alexandre-abrioux Alexandre ABRIOUX
    GPG key ID: 5C4778F91CA5BB29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2debad9 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/applications/graphics/digikam/default.nix
2 changes: 2 additions & 0 deletions pkgs/applications/graphics/digikam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
, boost
, eigen
, exiv2
, ffmpeg
, flex
, jasper
, lcms2
@@ -66,6 +67,7 @@ mkDerivation rec {
boost
eigen
exiv2
ffmpeg
flex
jasper
lcms2