From 1a486c47afd4c521b95ea0db2f8b23d24fbad654 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 18 Nov 2016 09:49:27 -0200 Subject: [PATCH] nitrogen: 1.5.2 -> 1.6.0 --- pkgs/tools/X11/nitrogen/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 070152427f29..06a7630c7bc0 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: -let version = "1.5.2"; +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "nitrogen-${version}"; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz"; - sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; + url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr"; }; - buildInputs = [ glib gtkmm2 pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - NIX_LDFLAGS = "-lX11"; + buildInputs = [ glib gtkmm2 ]; - patchPhase = "patchShebangs data/icon-theme-installer"; + NIX_CXXFLAGS_COMPILE = "-std=c++11"; + + patchPhase = '' + substituteInPlace data/Makefile.in --replace /usr/share $out/share + patchShebangs data/icon-theme-installer + ''; meta = { description = "A wallpaper browser and setter for X11";