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

Commits on Apr 4, 2020

  1. fluxus: Attempt to fix build 

    It requires Python2 scons.

But after fixing this, it fails with a different error.
    @jtojnar
    jtojnar committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    millotp Pierre Millot
    GPG key ID: AA0BFD6C7D668CBC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    71557e5 View commit details

  2. freenect: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    millotp Pierre Millot
    GPG key ID: AA0BFD6C7D668CBC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e37c162 View commit details

  3. indilib: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

While at it, also move cmake to nativeBuildInputs and format the expression.
    @jtojnar
    jtojnar committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    millotp Pierre Millot
    GPG key ID: AA0BFD6C7D668CBC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eb8e952 View commit details
Showing with 33 additions and 9 deletions.
  1. +1 −1 pkgs/applications/graphics/fluxus/default.nix
  2. +2 −2 pkgs/development/libraries/freenect/default.nix
  3. +30 −6 pkgs/development/libraries/indilib/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/fluxus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
openssl.dev
racket
];
nativeBuildInputs = [ scons ];
nativeBuildInputs = [ scons.py2 ];

patches = [ ./fix-build.patch ];
sconsFlags = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/freenect/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
, GLUT, Cocoa
}:

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9";
};

buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ]
buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ]
++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];

nativeBuildInputs = [ cmake pkgconfig ];
36 changes: 30 additions & 6 deletions pkgs/development/libraries/indilib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova
, curl, libjpeg, gsl }:
{ stdenv
, fetchurl
, cmake
, cfitsio
, libusb1
, zlib
, boost
, libnova
, curl
, libjpeg
, gsl
}:

stdenv.mkDerivation {
name = "indilib-1.1.0";
@@ -9,13 +19,27 @@ stdenv.mkDerivation {
sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w";
};

patches = [ ./udev-dir.patch ] ;
patches = [
./udev-dir.patch
];

buildInputs = [ curl cmake cfitsio libusb zlib boost
libnova libjpeg gsl ];
nativeBuildInputs = [
cmake
];

buildInputs = [
curl
cfitsio
libusb1
zlib
boost
libnova
libjpeg
gsl
];

meta = {
homepage = https://www.indilib.org/;
homepage = "https://www.indilib.org/";
license = stdenv.lib.licenses.lgpl2Plus;
description = "Implementaion of the INDI protocol for POSIX operating systems";
platforms = stdenv.lib.platforms.unix;