Do not assume the SDL_image and SLD_mixer libraries are installed at the same
prefix reported by sdl-config, but instead get flags from the pkg-config files
installed with these libraries.

--- a/SConscript	2011-12-24 15:46:47.000000000 -0600
+++ b/SConscript	2014-06-12 21:20:45.702668330 -0500
@@ -199,7 +199,13 @@
                 self.fatal_error += "  * library 'png' not found\n"
 
     def configure_sdl(self):
-        if self.conf.CheckMyProgram('sdl-config'):
+        if self.conf.CheckMyProgram('pkg-config'):
+            self.conf.env.ParseConfig("pkg-config --cflags --libs sdl")
+            for sdllib in ['image', 'mixer']:
+                self.conf.env.ParseConfig("pkg-config --cflags --libs SDL_%s" % sdllib)
+                if not self.conf.CheckSDLLib(sdllib):
+                    self.fatal_error += "  * SDL library '%s' not found\n" % sdllib
+        elif self.conf.CheckMyProgram('sdl-config'):
             self.conf.env.ParseConfig("sdl-config  --cflags --libs | sed 's/-I/-isystem/g'")
             for sdllib in ['image', 'mixer']:
                 if not self.conf.CheckSDLLib(sdllib):
a8ae62d79e554980938ccb318bb02dbda9'>refs</a><a class='active' href='/guix/log/nix/libstore/store-api.hh'>log</a><a href='/guix/tree/nix/libstore/store-api.hh?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>tree</a><a href='/guix/commit/nix/libstore/store-api.hh?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>commit</a><a href='/guix/diff/nix/libstore/store-api.hh?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libstore/store-api.hh'>
<input type='hidden' name='id' value='f7ca1fa8ae62d79e554980938ccb318bb02dbda9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>root</a>/<a href='/guix/log/nix?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>nix</a>/<a href='/guix/log/nix/libstore?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>libstore</a>/<a href='/guix/log/nix/libstore/store-api.hh?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9'>store-api.hh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/store-api.hh?id=f7ca1fa8ae62d79e554980938ccb318bb02dbda9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=81c580c8664bfeeb767e2c47ea343004e88223c7'>daemon: Make 'profiles/per-user' non-world-writable.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/37744&gt;.
Reported at &lt;https://www.openwall.com/lists/oss-security/2019/10/09/4&gt;.

Based on Nix commit 5a303093dcae1e5ce9212616ef18f2ca51020b0d
by Eelco Dolstra &lt;edolstra@gmail.com&gt;.

* nix/libstore/local-store.cc (LocalStore::LocalStore): Set 'perUserDir'
to #o755 instead of #o1777.
(LocalStore::createUser): New function.
* nix/libstore/local-store.hh (LocalStore): Add it.
* nix/libstore/store-api.hh (StoreAPI): Add it.
* nix/nix-daemon/nix-daemon.cc (performOp): In 'wopSetOptions', add
condition to handle "user-name" property and honor it.
(processConnection): Add 'userId' parameter.  Call 'store-&gt;createUser'
when userId is not -1.
* guix/profiles.scm (ensure-profile-directory): Note that this is now
handled by the daemon.
* guix/store.scm (current-user-name): New procedure.
(set-build-options): Add #:user-name parameter and pass it to the daemon.
* tests/guix-daemon.sh: Test the creation of 'profiles/per-user' when
listening on a TCP socket.
* tests/store.scm ("profiles/per-user exists and is not writable")
("profiles/per-user/$USER exists"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>