diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-06-15 07:49:25 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-06-15 23:34:20 +0200 |
| commit | b5ca04f4a88c86cd8132f8ca7080bd6d7e328599 (patch) | |
| tree | 5b62d7bb070a62bff22897cb8d74cf48fbc4f137 /pkgs/tools/X11/nitrogen | |
| parent | 05402bc7c85c91c05147a996cb5661ba90e64117 (diff) | |
| download | nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.tar nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.tar.gz nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.tar.bz2 nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.tar.lz nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.tar.xz nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.tar.zst nixlib-b5ca04f4a88c86cd8132f8ca7080bd6d7e328599.zip | |
nitrogen: patchShebangs instead of patchfile + /usr/bin/env
This hopefully fixes the build on Hydra.
Diffstat (limited to 'pkgs/tools/X11/nitrogen')
| -rw-r--r-- | pkgs/tools/X11/nitrogen/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index beecffd4b06f..182c058e1c12 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; - patches = [ ./nitrogen-env-bash.patch ]; + patchPhase = "patchShebangs data/icon-theme-installer"; meta = { description = "A wallpaper browser and setter for X11"; diff --git a/pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch b/pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch deleted file mode 100644 index dd8574dcd628..000000000000 --- a/pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/data/icon-theme-installer b/data/icon-theme-installer -index 328cf73..ca5d226 100755 ---- a/data/icon-theme-installer -+++ b/data/icon-theme-installer -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - - # icon-theme-installer - # Copyright (C) 2006 Novell, Inc. |