diff options
| author | Ram Kromberg <ramkromberg@mail.com> | 2016-07-21 06:50:59 +0300 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-21 05:50:59 +0200 |
| commit | 26008f28b8aa0834891d4dd2819c16133f08a31d (patch) | |
| tree | 2f111d60e6ced18ecb859d0d1073147c07667387 /pkgs/applications/misc | |
| parent | 2ce60ead606033ee877c2052286c9edce9c2b7d4 (diff) | |
| download | nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.tar nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.tar.gz nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.tar.bz2 nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.tar.lz nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.tar.xz nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.tar.zst nixlib-26008f28b8aa0834891d4dd2819c16133f08a31d.zip | |
lighthouse: 2016-01-26 -> 2016-07-20 (#17127)
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/lighthouse/Makefile.patch | 31 | ||||
| -rw-r--r-- | pkgs/applications/misc/lighthouse/default.nix | 31 |
2 files changed, 8 insertions, 54 deletions
diff --git a/pkgs/applications/misc/lighthouse/Makefile.patch b/pkgs/applications/misc/lighthouse/Makefile.patch deleted file mode 100644 index 0207299cc2c5..000000000000 --- a/pkgs/applications/misc/lighthouse/Makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Description: Fix lighthouse Makefile -Index: Makefile -=================================================================== ---- ./Makefile 1970-01-01 02:00:01.000000000 +0200 -+++ ./Makefile 1970-01-01 02:00:01.000000000 +0200 -@@ -19,21 +19,10 @@ - endif - - # Library specific --HAS_GDK := $(shell pkg-config --exists gdk-2.0 echo $?) --ifdef $(HAS_GDK) -- CFLAGS+=`pkg-config --cflags gdk-2.0` -- LDFLAGS+=`pkg-config --libs gdk-2.0` --else -- CFLAGS+=-DNO_GDK --endif --HAS_PANGO := $(shell pkg-config --exists pango echo $?) --ifdef $(HAS_PANGO) -- CFLAGS+=`pkg-config --cflags pango` -- LDFLAGS+=`pkg-config --libs pango` --else -- CFLAGS+=-DNO_PANGO --endif -- -+CFLAGS+=$(shell pkg-config --cflags gdk-2.0) -+LDFLAGS+=$(shell pkg-config --libs gdk-2.0) -+CFLAGS+=$(shell pkg-config --cflags pango) -+LDFLAGS+=$(shell pkg-config --libs pango) - - all: lighthouse - diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 8400c01665ec..6bd834846b66 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -4,39 +4,24 @@ stdenv.mkDerivation rec { name = "lighthouse-${date}"; - date = "2016-01-26"; + date = "2016-07-20"; src = fetchFromGitHub { owner = "emgram769"; repo = "lighthouse"; - rev = "bf11f111572475e855b0329202a14c9e128c7e57"; - sha256 = "1ppika61vg4sc9mczbkjqy2mhgxqg57xrnsmmq0h2lyvj0yhg3qn"; + rev = "d1813ef8e2aca9f6b3609b1e0c6d1d5ee683281a"; + sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; }; buildInputs = [ pkgconfig libX11 libxcb cairo gtk pango python27 python3 ]; - patches = [ ./Makefile.patch ]; - - lighthouseInstaller = '' - #!${stdenv.shell} - cp -r $out/share/lighthouse/.config/lighthouse \$HOME/.config - chmod -R +w \$HOME/.config/lighthouse - ''; - - installPhase = '' - mkdir -p $out/bin - cp lighthouse $out/bin - chmod +x config/lighthouse/cmd* - chmod +x config/lighthouse/google.py - patchShebangs config/lighthouse/ - patchShebangs config/lighthouse/scripts/ - mkdir -p $out/share/lighthouse/.config - cp -r config/lighthouse $out/share/lighthouse/.config - echo "${lighthouseInstaller}" > $out/bin/lighthouse-install - chmod +x $out/bin/lighthouse-install - ''; + makeFlags = [ "PREFIX=\${out}" ]; + + preFixup = "chmod +x $out/share/lighthouse/.config/lighthouse/google.py"; + + postFixup = "chmod -x $out/share/lighthouse/.config/lighthouse/google.py"; meta = with stdenv.lib; { description = "A simple flexible popup dialog to run on X"; |