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

Fix bad licenses on CUDA packages

Browse Source 
They were marked as "nonfree" rather than "unfree", causing them to be
allowed with allowUnfree = false.
This commit is contained in:
Eelco Dolstra 2015-02-15 22:28:32 +01:00
parent 33fa065f17
commit 2ba9ae0129
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/cudatoolkit/5.5.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} :
@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
meta = {
license = [ "nonfree" ];
license = lib.licenses.unfree;
};
}

4
pkgs/development/compilers/cudatoolkit/6.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} :
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
meta = {
license = [ "nonfree" ];
license = lib.licenses.unfree;
};
}

14
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, patchelf }:
{ lib, stdenv, fetchurl, patchelf }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "3.1";
date = "April2012";
name = "nvidia-cg-toolkit-${version}";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879";
}
else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}";
installPhase = ''
for b in cgc cgfxcat cginfo
do
@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/doc/$name/"
cp -v -r local/Cg/* "$out/share/doc/$name/"
'';
meta = {
homepage = http://developer.nvidia.com/cg-toolkit;
license = [ "nonfree-redistributable" ];
license = lib.licenses.unfreeRedistributable;
};
}