diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-02-26 21:57:49 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-06 00:45:47 -0500 |
| commit | 1bac79761679c249dee700c5112df51437ac2fc0 (patch) | |
| tree | 42443bd5eef862cda332650752fe893c39e425e6 | |
| parent | d1e58be70378d0a43aa325f94d260b4858dd109d (diff) | |
| download | nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.tar nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.tar.gz nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.tar.bz2 nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.tar.lz nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.tar.xz nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.tar.zst nixpkgs-1bac79761679c249dee700c5112df51437ac2fc0.zip | |
plymouth: update configure flags
- only set host when cross compiling - use top-level configureFlags and installFlags instead of putting it in the pre configure.
| -rw-r--r-- | pkgs/os-specific/linux/plymouth/default.nix | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b074c6d7244..1a8e3685e9c 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -26,34 +26,32 @@ stdenv.mkDerivation rec { -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \ -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \ configure.ac + ''; - configureFlags=" - --prefix=$out - --bindir=$out/bin - --sbindir=$out/sbin - --exec-prefix=$out - --libdir=$out/lib - --libexecdir=$out/lib - --sysconfdir=/etc - --with-systemdunitdir=$out/etc/systemd/system - --localstatedir=/var - --with-logo=/etc/plymouth/logo.png - --with-background-color=0x000000 - --with-background-start-color-stop=0x000000 - --with-background-end-color-stop=0x000000 - --with-release-file=/etc/os-release - --without-system-root-install - --without-rhgb-compat-link - --enable-tracing - --enable-systemd-integration - --enable-pango - --enable-gdm-transition - --enable-gtk" + configureFlags = [ + "--sysconfdir=/etc" + "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system" + "--localstatedir=/var" + "--with-logo=/etc/plymouth/logo.png" + "--with-background-color=0x000000" + "--with-background-start-color-stop=0x000000" + "--with-background-end-color-stop=0x000000" + "--with-release-file=/etc/os-release" + "--without-system-root-install" + "--without-rhgb-compat-link" + "--enable-tracing" + "--enable-systemd-integration" + "--enable-pango" + "--enable-gdm-transition" + "--enable-gtk" + ]; - installFlags=" - plymouthd_defaultsdir=$out/share/plymouth - plymouthd_confdir=$out/etc/plymouth" - ''; + configurePlatforms = [ "host" ]; + + installFlags = [ + "plymouthd_defaultsdir=$(out)/share/plymouth" + "plymouthd_confdir=$(out)/etc/plymouth" + ]; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/Plymouth; |