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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2018-11-30 20:09:45 +01:00
parent e6834171b9 095544187a
commit c5881ec2c9
104 changed files with 1238 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/misc/screensavers/xautolock/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto }:
{ stdenv, fetchurl, xlibsWrapper
, imake, gccmakedep, libXScrnSaver, scrnsaverproto }:
stdenv.mkDerivation rec {
name = "xautolock-2.2";
@@ -14,10 +15,13 @@ stdenv.mkDerivation rec {
})
];
NIX_CFLAGS_COMPILE = "-DSYSV";
makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man";
preBuild = "xmkmf";
makeFlags = [
"BINDIR=$(out)/bin"
"MANPATH=$(out)/share/man"
];
installTargets = "install install.man";
buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ];
meta = with stdenv.lib; {
description = "A program that launches a given program when your X session has been idle for a given time.";
homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;

2
pkgs/misc/themes/nordic/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
})
(fetchurl {
url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
sha256 = "0xnj1am1q26xppp8y07iik648hhgn3gmzqvkdhg3il4qnkndjvld";
sha256 = "1h0690cijaipidb5if2bxhvvkrx5src3akyxvfywxg4bf8x7jxs5";
})
];