diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/servers/x11 | |
parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
download | nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixlib-0518ccf5af90017df31c445f52badaff45b6b7cd.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/unichrome/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index bc1ebf4eb43e..b9cedfc4679f 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://unichrome.sourceforge.net/"; description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; |