nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7162 from spwhitt/simple_darwin_fixes

Browse Source 
sl, astyle, uncrustify, mediainfo: Darwin fixes
This commit is contained in:
Arseniy Seroka 2015-04-04 23:03:15 +03:00
commit 5fa1644d28
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/mediainfo/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://mediaarea.net/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

2
pkgs/development/libraries/libmediainfo/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Shared library for mediainfo";
homepage = http://mediaarea.net/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

2
pkgs/development/libraries/libzen/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
description = "Shared library for libmediainfo and mediainfo";
homepage = http://mediaarea.net/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

14
pkgs/development/tools/misc/astyle/default.nix
View File

@ -12,16 +12,22 @@ stdenv.mkDerivation {
sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv";
};
sourceRoot = "astyle/build/gcc";
sourceRoot = if (stdenv.cc.cc.isClang or false)
then "astyle/build/clang"
else "astyle/build/gcc";
# -s option is obsolete on Darwin and breaks build
postPatch = if stdenv.isDarwin then ''
substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr ="
'' else null;
installFlags = "INSTALL=install prefix=$$out";
meta = {
homepage = "http://astyle.sourceforge.net/";
description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
license = "LGPL";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

2
pkgs/development/tools/misc/uncrustify/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
homepage = http://uncrustify.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}

2
pkgs/tools/misc/sl/default.nix
View File

@ -27,6 +27,6 @@ stdenv.mkDerivation {
url = https://github.com/mtoyoda/sl/blob/master/LICENSE;
};
description = "Steam Locomotive runs across your terminal when you type 'sl'";
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; unix;
};
}