diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-04-19 18:19:48 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2018-04-29 07:52:54 +0800 |
| commit | 058df14f81482e05fad93b017e8a8d45cea10db5 (patch) | |
| tree | 60e4e600d43c8c3b5e60b7e367dc2e0df5a521dd /pkgs/applications/networking/instant-messengers/ratox | |
| parent | 15268306febdc338ec6a00e8099c1904287f598a (diff) | |
ratox: 0.4 -> 0.4.20180303
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/ratox')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ratox/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch | 5 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 5d004db60e3ad..add337d3f0856 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -5,22 +5,24 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in -stdenv.mkDerivation rec { - name = "ratox-0.4"; +in stdenv.mkDerivation rec { + name = "ratox-0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; - rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; - sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; + rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb"; + sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74"; }; - patches = [ ./ldlibs.patch ]; - buildInputs = [ libtoxcore ]; - preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preConfigure = '' + substituteInPlace config.mk \ + --replace '-lsodium -lopus -lvpx ' "" + + ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch deleted file mode 100644 index 1406e71431070..0000000000000 --- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib --LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread -+LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread |