public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123506 from stephank/fix-spacenav-cube-example-darwin

Browse Source 
spacenav-cube-example: fix darwin build
This commit is contained in:
Jörg Thalheim 2021-05-19 06:54:49 +01:00 committed by GitHub
commit 9a417aebd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/spacenav-cube-example/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
buildInputs = [ libX11 mesa_glu libspnav ]; buildInputs = [ libX11 mesa_glu libspnav ];
configureFlags = [ "--disable-debug" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

3
pkgs/development/libraries/libspnav/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, libX11}: { stdenv, lib, fetchFromGitHub, libX11, fixDarwinDylibNames }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.3"; version = "0.2.3";
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba";
}; };
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ libX11 ]; buildInputs = [ libX11 ];
configureFlags = [ "--disable-debug"]; configureFlags = [ "--disable-debug"];