swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

libunique: fix build with gcc-7 by fixing a bug

Browse source
This commit is contained in:
Vladimír Čunát 2018-02-18 10:35:46 +01:00
parent e202018d1f
commit 64db4f7a57
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/libunique/default.nix
View file

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
./1.1.6-fix-test.patch
./1.1.6-G_CONST_RETURN.patch
./1.1.6-include-terminator.patch
];
]
++ [ ./gcc7-bug.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib gtk2 dbus_glib ];
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
homepage = http://live.gnome.org/LibUnique;
homepage = https://wiki.gnome.org/Attic/LibUnique;
description = "A library for writing single instance applications";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux;

18
pkgs/development/libraries/libunique/gcc7-bug.patch Normal file
View file

@ -0,0 +1,18 @@
gcc-7 newly detects this class of bugs.
In this particular case it's clear that the inention was
to detect if the string is non-NULL *and* non-empty.
diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c
index b40a86c..66a7226 100644
--- a/unique/uniqueapp.c
+++ b/unique/uniqueapp.c
@@ -176,7 +176,7 @@ set_startup_id (UniqueBackend *backend,
{
gchar *id;
- if (startup_id && startup_id != '\0')
+ if (startup_id && *startup_id != '\0')
id = g_strdup (startup_id);
else
{