diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-27 15:40:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 15:40:49 -0500 |
| commit | cfd79b4d8a525fe875d77bc7dfd2267000a634b0 (patch) | |
| tree | 44710819c4fcdd39af93c40f62c9066e7a80833a /pkgs/applications | |
| parent | 0b53d63dad1ea50512dde126c3c3b46de59c4cce (diff) | |
| parent | 5ed0ae686b7fca2718076ef7c5ad58c9a44aefcc (diff) | |
| download | nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.tar nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.tar.gz nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.tar.bz2 nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.tar.lz nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.tar.xz nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.tar.zst nixlib-cfd79b4d8a525fe875d77bc7dfd2267000a634b0.zip | |
Merge pull request #37934 from dtzWill/fix/slim-musl
slim: musl patch
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/display-managers/slim/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 5d06c2221b34..5160e02963f2 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng , fontconfig, freetype, pam, dbus_libs, makeWrapper }: stdenv.mkDerivation rec { @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { # Allow to set logfile to a special "/dev/stderr" in order to continue # logging to stderr and thus to the journal. ./no-logfile.patch - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch"; + sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm"; + }); preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib"; |