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: b763f39ce5ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 937ec235b7aa
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 23, 2019

  1. strawberry: do not use alias

    @jtojnar
    jtojnar committed Nov 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b015e4 View commit details

  2. appimage: do not use alias

    @jtojnar
    jtojnar committed Nov 23, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    937ec23 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/applications/audio/strawberry/default.nix
  2. +1 −1 pkgs/build-support/appimage/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/strawberry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
, libpulseaudio ? null
, libselinux ? null
, libsepol ? null
, p11_kit ? null
, p11-kit ? null
, utillinux ? null
, qtbase
, qtx11extras
@@ -66,7 +66,7 @@ mkDerivation rec {
libpulseaudio
libselinux
libsepol
p11_kit
p11-kit
utillinux
]
++ lib.optionals withGstreamer (with gst_all_1; [
2 changes: 1 addition & 1 deletion pkgs/build-support/appimage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
p11_kit
p11-kit

# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage