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

Commits on Mar 30, 2019

  1. peek: build with vala_0_40 

    Fixes #58433

(cherry picked from commit b556663)
    @worldofpeace
    worldofpeace committed Mar 30, 2019
    Copy the full SHA
    a4ae8ce View commit details
Showing with 17 additions and 5 deletions.
  1. +17 −5 pkgs/applications/video/peek/default.nix
22 changes: 17 additions & 5 deletions pkgs/applications/video/peek/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook
{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook
, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg
}:

stdenv.mkDerivation rec {
name = "peek-${version}";
pname = "peek";
version = "1.3.1";

src = fetchFromGitHub {
owner = "phw";
repo = "peek";
repo = pname;
rev = version;
sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb";
};
@@ -17,9 +17,21 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
'';

nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];
nativeBuildInputs = [
cmake
gettext
pkgconfig
libxml2.bin
txt2man
vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433
wrapGAppsHook
];

buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ];
buildInputs = [
gsettings-desktop-schemas
gtk3
keybinder3
];

enableParallelBuilding = true;