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

Commits on Jul 13, 2017

  1. libraw: set meta.platforms to unix

    @vbgl
    vbgl committed Jul 13, 2017
    Copy the full SHA
    058f46c View commit details

  2. libspectre: set meta.platforms to unix

    @vbgl
    vbgl committed Jul 13, 2017
    Copy the full SHA
    247e772 View commit details

  3. gst-plugins-good: fix build on darwin

    @vbgl
    vbgl committed Jul 13, 2017
    Copy the full SHA
    68ee2c6 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/libraries/gstreamer/good/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, libvpx, speex, flac, taglib, libshout
, cairo, gdk_pixbuf, aalib, libcaca
, libsoup, libpulseaudio, libintlOrEmpty
, darwin
}:

let
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
libsoup libshout
]
++ libintlOrEmpty
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];

preFixup = ''
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libraw/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
homepage = http://www.libraw.org/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

2 changes: 1 addition & 1 deletion pkgs/development/libraries/libspectre/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
'';

license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}