diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-06 16:18:51 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-06 16:18:51 +0000 |
| commit | 9afbeb71219925d54b72b0170b2e3be76bad1e28 (patch) | |
| tree | d80c6bf0441de5412475859de320806b0e5a454c /nixpkgs/pkgs/desktops/pantheon/apps | |
| parent | 75eafe97f7df0d653bec67f3962214d7c357831f (diff) | |
| parent | ae6bdcc53584aaf20211ce1814bea97ece08a248 (diff) | |
| download | nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.gz nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.bz2 nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.lz nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.xz nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.tar.zst nixlib-9afbeb71219925d54b72b0170b2e3be76bad1e28.zip | |
Merge commit 'ae6bdcc53584aaf20211ce1814bea97ece08a248'
# Conflicts: # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/apps')
| -rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix | 3 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix | 38 |
2 files changed, 31 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 6e050c92d805..1ff1068119b7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -11,6 +11,7 @@ , gtk3 , networkmanager , networkmanagerapplet +, libnma , switchboard }: @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libgee networkmanager - networkmanagerapplet + libnma switchboard ]; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index cc6b37095fdb..67f4105ff3d1 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -1,7 +1,8 @@ { wrapGAppsHook , glib , lib -, symlinkJoin +, stdenv +, xorg , switchboard , switchboardPlugs , plugs @@ -14,26 +15,45 @@ let if plugs == null then switchboardPlugs else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs); in -symlinkJoin { +stdenv.mkDerivation rec { name = "${switchboard.name}-with-plugs"; + src = null; + paths = [ switchboard ] ++ selectedPlugs; - buildInputs = [ - wrapGAppsHook + passAsFile = [ "paths" ]; + + nativeBuildInputs = [ glib - ] ++ (lib.forEach selectedPlugs (x: x.buildInputs)) + wrapGAppsHook + ]; + + buildInputs = lib.forEach selectedPlugs (x: x.buildInputs) ++ selectedPlugs; - postBuild = '' - make_glib_find_gsettings_schemas + dontUnpack = true; + dontConfigure = true; + dontBuild = true; - gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard") + preferLocalBuild = true; + allowSubstitutes = false; - wrapGAppsHook + installPhase = '' + mkdir -p $out + for i in $(cat $pathsPath); do + ${xorg.lndir}/bin/lndir -silent $i $out + done + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard" + ) ''; inherit (switchboard) meta; } + |