Skip to content

Commit 67c73b4

Browse files
dezgegdezgeg
committedJan 17, 2018
Merge commit '2e56ba' from staging into master
2 parents 5ab499d + 2e56ba6 commit 67c73b4

File tree

97 files changed

+230
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+230
-304
lines changed
 

Diff for: ‎pkgs/applications/misc/gnuradio/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
6363
addGRCBlocksPath() {
6464
addToSearchPath GRC_BLOCKS_PATH $1/share/gnuradio/grc/blocks
6565
}
66-
envHooks+=(addGRCBlocksPath)
66+
addEnvHooks "$targetOffset" addGRCBlocksPath
6767
'';
6868

6969
setupHook = [ grcSetupHook ];

Diff for: ‎pkgs/applications/video/gnome-mpv/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
2626
'';
2727

2828
doCheck = true;
29-
checkPhase = "meson test";
3029

3130
meta = with stdenv.lib; {
3231
description = "Simple GTK+ frontend for the mpv video player";

3 commit comments

Comments
 (3)

vcunat commented on Jan 17, 2018

@vcunat
vcunat
on Jan 17, 2018
Member

@dezgeg: I assume you wanted to avoid the mass Darwin rebuild due to clang? #33953 I think it fixes some real problems, but maybe much will be fixed by cherry-picking the subsequent commits.

dezgeg commented on Jan 17, 2018

@dezgeg
dezgeg
on Jan 17, 2018
ContributorAuthor

Yeah, that was the plan. Is there that much breakage?

dezgeg commented on Jan 17, 2018

@dezgeg
dezgeg
on Jan 17, 2018
ContributorAuthor

I did cherry picks based on some IRC conversations.

Please sign in to comment.